check if activity has been paused before performing main toolbar button onClick

1 files changed, 6 insertions, 1 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPDrawerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WPDrawerActivity.java
index c9dcc88a2..e297b2a54 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPDrawerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPDrawerActivity.java
@@ -92,6 +92,7 @@ public abstract class WPDrawerActivity extends ActionBarActivity {
     private ListView mDrawerListView;
     private Spinner mBlogSpinner;
     private ListScrollPositionManager mScrollPositionManager;
+    private boolean mIsPaused;
 
     private static final int OPENED_FROM_DRAWER_DELAY = 250;
 
@@ -138,6 +139,7 @@ public abstract class WPDrawerActivity extends ActionBarActivity {
     @Override
     protected void onPause() {
         super.onPause();
+        mIsPaused = true;
         unregisterReceiver();
 
         if (isAnimatingRefreshButton) {
@@ -155,6 +157,7 @@ public abstract class WPDrawerActivity extends ActionBarActivity {
     @Override
     protected void onResume() {
         super.onResume();
+        mIsPaused = false;
         registerReceiver();
         refreshMenuDrawer();
         if (mDrawerToggle != null) {
@@ -287,7 +290,9 @@ public abstract class WPDrawerActivity extends ActionBarActivity {
         getToolbar().setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (isFinishing()) return;
+                if (isFinishing() || mIsPaused) {
+                    return;
+                }
 
                 FragmentManager fm = getFragmentManager();
                 if (fm.getBackStackEntryCount() > 0) {