CHANGELOG: Fixed taskbar not getting disabled on tablets

siavash79 · Oct 28, 2024 · 36658c5 · 36658c5
1 parent 35db244
commit 36658c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/edit2MakeNewCanary b/.github/edit2MakeNewCanary
@@ -1 +1 @@
-Editing this file will trigger the build script for a new canary.
+Editing this file will trigger the build script for a new canary..
diff --git a/app/src/main/java/sh/siava/pixelxpert/modpacks/launcher/TaskbarActivator.java b/app/src/main/java/sh/siava/pixelxpert/modpacks/launcher/TaskbarActivator.java
@@ -87,7 +87,7 @@ public void updatePrefs(String... Key) {
 			SystemUtils.killSelf();
 		}
 
-		taskbarMode = Integer.parseInt(Xprefs.getString("taskBarMode", "0"));
+		taskbarMode = Integer.parseInt(Xprefs.getString("taskBarMode", String.valueOf(TASKBAR_DEFAULT)));
 
 		TaskbarAsRecents = Xprefs.getBoolean("TaskbarAsRecents", false);
 		TaskbarHideAllAppsIcon = true;//Xprefs.getBoolean("TaskbarHideAllAppsIcon", false);
@@ -129,9 +129,7 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpParam) throws Th
 			protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
 				if(taskbarMode == TASKBAR_DEFAULT) return;
 
-				boolean taskbarEnabled = taskbarMode == TASKBAR_ON;
-
-				if(taskbarEnabled) param.setResult(true);
+				param.setResult(taskbarMode == TASKBAR_ON);
 			}
 		});