History

tweaks to script engine shutdown behavior

ZappoMan committed 12 years ago

Commit af52be71 parent 524a4142 files · +13 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+4−2
@@ -263,6 +263,8 @@ Application::~Application() { · 262 unmodified lines
263 delete _settings;263 delete _settings;
264 delete _followMode;264 delete _followMode;
265 delete _glWidget;265 delete _glWidget;
266
267 qDebug() << "DONE... Application::~Application()\n";
266}268}
267 269
268void Application::restoreSizeAndPosition() {270void Application::restoreSizeAndPosition() {
@@ -4435,8 +4437,8 @@ void Application::loadScript() { · 4166 unmodified lines
4435 connect(scriptEngine, SIGNAL(finished()), workerThread, SLOT(quit()));4437 connect(scriptEngine, SIGNAL(finished()), workerThread, SLOT(quit()));
4436 4438
4437 // when the thread is terminated, add both scriptEngine and thread to the deleteLater queue4439 // when the thread is terminated, add both scriptEngine and thread to the deleteLater queue
4438 connect(workerThread, SIGNAL(terminated()), scriptEngine, SLOT(deleteLater()));4440 connect(workerThread, SIGNAL(finished()), scriptEngine, SLOT(deleteLater()));
4439 connect(workerThread, SIGNAL(terminated()), workerThread, SLOT(deleteLater()));4441 connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));
4440 4442
4441 // when the application is about to quit, stop our script engine so it unwinds properly4443 // when the application is about to quit, stop our script engine so it unwinds properly
4442 connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop()));4444 connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop()));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t