From 139a96182d2a52e25b42ec35f834f7a10f30675c Mon Sep 17 00:00:00 2001
From: Tony Puccinelli
Date: Thu, 12 Aug 2010 23:55:12 +0000
Subject: modified DS makefile to use new plugin design where only one plugin
 is loaded at a time and tested successfully on the DS. Added code to prevent
 a crash in the case where there are no engine plugins present. Removed code
 for R_ARM_TARGET1 in arm-loader, as it is no longer used and was never used
 successfully

svn-id: r52052
---
 base/plugins.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'base')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index dbf29f63b7..aac18c4173 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -347,6 +347,7 @@ void PluginManager::loadFirstPlugin() { //TODO: rename? It's not quite clear tha
 }
 
 bool PluginManager::loadNextPlugin() {
+	if (nonEnginePlugs == _allPlugs.size()) return false; //There are no Engine Plugins in this case.
 	//To ensure only one engine plugin is loaded at a time, we unload all engine plugins before trying to load a new one.
 	unloadPluginsExcept(PLUGIN_TYPE_ENGINE, NULL);
 	++_currentPlugin;
-- 
cgit v1.2.3