Check if ActivityMonitor is null before calling waitForActivityWithTi…

…meout
RobotiumTech · Feb 3, 2016 · bf4b6be · bf4b6be
1 parent 9c25822
commit bf4b6be
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/robotium-solo/src/main/java/com/robotium/solo/ActivityUtils.java b/robotium-solo/src/main/java/com/robotium/solo/ActivityUtils.java
@@ -142,21 +142,22 @@ private void setupActivityStackListener() {
 		if(activityMonitor == null){
 			return;
 		}
-		
+
 		setRegisterActivities(true);
-		
+
 		Runnable runnable = new Runnable() {
 			public void run() {
 				while (shouldRegisterActivities()) {
-
-					Activity activity = activityMonitor.waitForActivityWithTimeout(2000);
-
-					if(activity != null){
-						if (activitiesStoredInActivityStack.remove(activity.toString())){
-							removeActivityFromStack(activity);
-						}
-						if(!activity.isFinishing()){
-							addActivityToStack(activity);
+					if(activityMonitor != null){
+						Activity activity = activityMonitor.waitForActivityWithTimeout(2000);
+
+						if(activity != null){
+							if (activitiesStoredInActivityStack.remove(activity.toString())){
+								removeActivityFromStack(activity);
+							}
+							if(!activity.isFinishing()){
+								addActivityToStack(activity);
+							}
 						}
 					}
 				}