Fixed errorneous pausing due to pauseEmulator being called during Act…

…ionBar

validation no Honeycomb+

src/com/androidemu/EmulatorActivity.java

@@ -252,7 +252,14 @@ public boolean onPrepareOptionsMenu(Menu menu)
 		if (!isMenuShowing)
 		{
 			isMenuShowing = true;
-			pauseEmulator();
+
+			// On Honeycomb and newer this function is called
+			// during some ActionBar manipulation, so no need to
+			// pause
+			if (Wrapper.SDK_INT < 11)
+			{
+				pauseEmulator();
+			}
 		}
 
 		return true;
@@ -403,20 +410,29 @@ public void run()
 
 	private void resumeEmulator()
 	{
+		debug("Resume requested");
+
 		if (resumeRequested++ == 0)
 		{
 			keyboard.reset();
 			keypad.reset();
 			trackball.reset();
 			onGameKeyChanged();
 
+			debug("Resuming");
 			emulator.resume();
 		}
 	}
 
 	private void pauseEmulator()
 	{
-		if (--resumeRequested == 0) emulator.pause();
+		debug("Pause requested");
+
+		if (--resumeRequested == 0)
+		{
+			debug("Pausing");
+			emulator.pause();
+		}
 	}
 
 	private static int getScalingMode(String mode)
@@ -600,7 +616,6 @@ private boolean loadROM(String fname, boolean failPrompt)
 		}
 		currentGame = fname;
 		hidePlaceholder();
-		emulatorView.setActualSize(Emulator.VIDEO_W, Emulator.VIDEO_H);
 
 		Wrapper.Activity_invalidateOptionsMenu(this);
 		return true;