Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 20:55:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2876 from ey6es/master

Browse source 
Fix for stopping scripts on Windows.
This commit is contained in:
Andrzej Kapolka 2014-05-17 19:10:52 -07:00
commit 914634f73a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -169,8 +169,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
_voxelHideShowThread(&_voxels), _voxelHideShowThread(&_voxels),
_packetsPerSecond(0), _packetsPerSecond(0),
_bytesPerSecond(0), _bytesPerSecond(0),
_previousScriptLocation(),
_nodeBoundsDisplay(this), _nodeBoundsDisplay(this),
_previousScriptLocation(),
_runningScriptsWidget(new RunningScriptsWidget(_window)), _runningScriptsWidget(new RunningScriptsWidget(_window)),
_runningScriptsWidgetWasVisible(false) _runningScriptsWidgetWasVisible(false)
{ {
@ -3422,8 +3422,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
} }
// start the script on a new thread... // start the script on a new thread...
ScriptEngine* scriptEngine = new ScriptEngine(QUrl(scriptName), &_controllerScriptingInterface); QUrl scriptUrl(scriptName);
_scriptEnginesHash.insert(scriptName, scriptEngine); ScriptEngine* scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
_scriptEnginesHash.insert(scriptUrl.toString(), scriptEngine);
if (!scriptEngine->hasScript()) { if (!scriptEngine->hasScript()) {
qDebug() << "Application::loadScript(), script failed to load..."; qDebug() << "Application::loadScript(), script failed to load...";