Merge pull request #2201 from ZappoMan/bugfixes

fix infinite reloading of missing script files
This commit is contained in:
Philip Rosedale 2014-03-04 16:47:19 -08:00
commit 868e6ba738

View file

@ -3479,7 +3479,6 @@ void Application::cleanupScriptMenuItem(const QString& scriptMenuName) {
}
void Application::loadScript(const QString& fileNameString) {
_activeScripts.append(fileNameString);
QByteArray fileNameAscii = fileNameString.toLocal8Bit();
const char* fileName = fileNameAscii.data();
@ -3489,6 +3488,7 @@ void Application::loadScript(const QString& fileNameString) {
return;
}
qDebug("Loading file %s...", fileName);
_activeScripts.append(fileNameString);
// get file length....
unsigned long fileLength = file.tellg();