From 205806982bfa1ad1de2e1ad85a4bd83fa310b2da Mon Sep 17 00:00:00 2001
From: Bertrand BRUN <bertrand0brun@gmail.com>
Date: Wed, 2 Feb 2011 20:25:19 +0100
Subject: [PATCH] Ajout du fait que lorsque l'on est sur la page de garde et
 que l'on fait retour on ne revienne pas sur le splash

---
 code/PtiClic/src/org/pticlic/FrontPage.java | 1 -
 code/PtiClic/src/org/pticlic/Main.java      | 8 +++++++-
 code/PtiClic/src/org/pticlic/Score.java     | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/PtiClic/src/org/pticlic/FrontPage.java b/code/PtiClic/src/org/pticlic/FrontPage.java
index cff08ce..5485779 100644
--- a/code/PtiClic/src/org/pticlic/FrontPage.java
+++ b/code/PtiClic/src/org/pticlic/FrontPage.java
@@ -35,7 +35,6 @@ public class FrontPage extends Activity implements OnClickListener{
 		String loginPref = sp.getString("login", "joueur");
 		// On l'ajoute dans le TextView prévu à cet effet
 		((TextView)findViewById(R.id.login)).setText("Login : " + loginPref);
-		System.out.println("FrontPage.onStart()");
 	}
 
 	/* (non-Javadoc)
diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java
index 3b7b045..c552f05 100644
--- a/code/PtiClic/src/org/pticlic/Main.java
+++ b/code/PtiClic/src/org/pticlic/Main.java
@@ -27,8 +27,14 @@ public class Main extends Activity {
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
+		
+	}
+	
+	@Override
+	protected void onStop() {
+		super.onStop();
 
-		System.exit(0);
+		finish();
 	}
 
 }
\ No newline at end of file
diff --git a/code/PtiClic/src/org/pticlic/Score.java b/code/PtiClic/src/org/pticlic/Score.java
index b9c1f8e..8d7a1de 100644
--- a/code/PtiClic/src/org/pticlic/Score.java
+++ b/code/PtiClic/src/org/pticlic/Score.java
@@ -65,6 +65,5 @@ public class Score extends Activity implements OnClickListener{
 		if (v.getId()==R.id.saw) {
 			finish();
 		}
-		
 	}
 }