diff --git a/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java b/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java index 354aba7..037966d 100644 --- a/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java +++ b/app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java @@ -304,17 +304,21 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu @Override public void onBackPressed() { - if (serviceTrackingDog.isDogActivated() || serviceTrackingDog.isTraceurActivated()) { - Toast.makeText(ctx, "Une trace est en cours d'enregistrement.", Toast.LENGTH_LONG).show(); - return ; - } + if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) { + mDrawerLayout.closeDrawer(GravityCompat.START); + } else { + if (serviceTrackingDog.isDogActivated() || serviceTrackingDog.isTraceurActivated()) { + Toast.makeText(ctx, "Une trace est en cours d'enregistrement.", Toast.LENGTH_LONG).show(); + return; + } - super.onBackPressed(); - pause(); - if (serviceTrackingDog != null) { - serviceTrackingDog.close(); + super.onBackPressed(); + pause(); + if (serviceTrackingDog != null) { + serviceTrackingDog.close(); + } + zoomed = false; } - zoomed = false; } //