another paranoia check

[ms2-fixes] / MS2Debounce / src / de / rmdir / ms2debounce / DebounceModuleHelper.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 93fd221a54fe3aa85961cfd60823b58d12cfc679..75607b819bcdf2524eb240ed24175301d9232133 100644 (file)
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -30,7 +30,12 @@ public class DebounceModuleHelper
 
                extractModule();
 
-               // FIXME: Read settings from database...
+               SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+               SharedPreferences.Editor editor = settings.edit();
+               if (is_safe_to_load()) {
+                       editor.putBoolean("safe_to_load", false);
+                       editor.commit();
+               }
 
                try {
                        Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay});
@@ -38,18 +43,18 @@ public class DebounceModuleHelper
                } catch (Exception e) {
                        return;
                }
+
+               if (!isLoaded()) {
+                       return;
+               }
        
                if (getDelay() <= 0) {
                        return;
                }
 
                /* Module was obviously loaded, so it is safe to load on boot */
-               if (!is_safe_to_load()) {
-                       SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-                       SharedPreferences.Editor editor = settings.edit();
-                       editor.putBoolean("safe_to_load", true);
-                       editor.commit();
-               }
+               editor.putBoolean("safe_to_load", true);
+               editor.commit();
        }
 
        public synchronized void unloadModule() {