ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Stop plugins on shutdown

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-07-30 14:16:43 +02:00
parent 69a6092eb7
commit 718dd36386
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -296,6 +296,7 @@ public class RuneLite
public void shutdown() public void shutdown()
{ {
pluginManager.stopCorePlugins();
clientSessionManager.shutdown(); clientSessionManager.shutdown();
discordService.close(); discordService.close();
executorService.shutdown(); executorService.shutdown();

17
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
View File

@@ -214,6 +214,23 @@ public class PluginManager
} }
} }
public void stopCorePlugins()
{
List<Plugin> scannedPlugins = new ArrayList<>(plugins);
for (Plugin plugin : scannedPlugins)
{
try
{
stopPlugin(plugin);
plugins.remove(plugin);
}
catch (PluginInstantiationException ex)
{
log.warn("Unable to stop plugin {}. {}", plugin.getClass().getSimpleName(), ex);
}
}
}
List<Plugin> scanAndInstantiate(ClassLoader classLoader, String packageName) throws IOException List<Plugin> scanAndInstantiate(ClassLoader classLoader, String packageName) throws IOException
{ {
MutableGraph<Class<? extends Plugin>> graph = GraphBuilder MutableGraph<Class<? extends Plugin>> graph = GraphBuilder