Преглед на файлове

/loadplugin now works as expected.

Previously loading would fail if the p[ugin was already known to exist by the plugin manager (but not loaded) now if its already known it will correctly load/enable it.
Fixes issue 726


git-svn-id: http://svn.dmdirc.com/branches/0.5.5@3304 00569f92-eb28-0410-84fd-f71c24880f
remotes/0.5.5
Shane Mc Cormack преди 16 години
родител
ревизия
fa9c57cc51
променени са 1 файла, в които са добавени 11 реда и са изтрити 1 реда
  1. 11
    1
      src/com/dmdirc/commandparser/commands/global/LoadPlugin.java

+ 11
- 1
src/com/dmdirc/commandparser/commands/global/LoadPlugin.java Целия файл

@@ -60,7 +60,17 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
60 60
             PluginManager.getPluginManager().getPluginInfo(args[0]).loadPlugin();
61 61
             sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
62 62
         } else {
63
-            sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Loading failed");
63
+            PluginInfo plugin = PluginManager.getPluginManager().getPluginInfo(args[0]);
64
+            if (plugin == null) {
65
+                sendLine(origin, isSilent, FORMAT_ERROR, "Plugin Loading failed");
66
+            } else {
67
+                if (!plugin.isLoaded()) {
68
+                    PluginManager.getPluginManager().getPluginInfo(args[0]).loadPlugin();
69
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin loaded.");
70
+                } else {
71
+                    sendLine(origin, isSilent, FORMAT_OUTPUT, "Plugin already loaded.");
72
+                }
73
+            }
64 74
         }
65 75
     }
66 76
     

Loading…
Отказ
Запис