Merge branch 'master' of github.com:fengberd/MinecraftPEServer

README.md

@@ -9,7 +9,7 @@ PocketMine = Install App -> Install PHP -> Check PocketMine at Server Type  -> P
 
 Nukkit = Rooting -> Install App -> Install Java -> Check Nukkit at Server Type -> Press Mount Java Library(ROOT), if you use KingRoot, you check Use ku.sud in to request root in Settings -> Press Start Server
 
-# About JRE
+# About JRE (ARM ONLY,NO x86 BINARY IN CURRENT)
 You can get "nukkit_library.tar.gz" from <a href="https://www.dropbox.com/s/c6xnyehgdtwobct/nukkit_library.tar.gz?dl=0">Here</a>
 
 # LICENSE

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "net.fengberd.minecraftpe_server"
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 1090
-        versionName "1.0.9.0"
+        versionCode 1091
+        versionName "1.0.9.1"
         vectorDrawables.useSupportLibrary = true
     }
 

app/src/main/java/moe/berd/pocket_server/activity/MainActivity.java

@@ -266,12 +266,20 @@ public void run()
 
 	public void switchFragment(Fragment target,int title)
 	{
-		getFragmentManager().beginTransaction()
-			.setCustomAnimations(R.animator.enter,R.animator.exit)
-			.replace(R.id.layout_main,target)
-			.commit();
-		currentFragment=target;
-		setTitle(title);
+		try
+		{
+			getFragmentManager().beginTransaction()
+				.setCustomAnimations(R.animator.enter,R.animator.exit)
+				.replace(R.id.layout_main,target)
+				.commit();
+			currentFragment=target;
+			setTitle(title);
+		}
+		catch(Exception e)
+		{
+			// commitAllowingStateLoss is danger so I prefer to crash the Exception
+			toast(e.toString());
+		}
 	}
 
 	public void chooseFile(int code,String title)

app/src/main/java/moe/berd/pocket_server/fragment/MainFragment.java

@@ -140,7 +140,10 @@ public void run()
 							{
 								public void run()
 								{
-									processing_dialog.dismiss();
+									if(processing_dialog.isShowing())
+									{
+										processing_dialog.dismiss();
+									}
 								}
 							});
 						}

app/src/main/java/moe/berd/pocket_server/fragment/SettingsFragment.java

@@ -62,7 +62,10 @@ public void run()
 						{
 							public void run()
 							{
-								processing_dialog.dismiss();
+								if(processing_dialog.isShowing())
+								{
+									processing_dialog.dismiss();
+								}
 							}
 						});
 					}