History

Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet

Atlante45 committed 11 years ago

Commit 20398952 parents 4d1529f d322f5829 files · +226 −167Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 29 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+1−1
@@ -201,7 +201,7 @@ void WindowScriptingInterface::showNonBlockingForm(const QString& title, QScript · 200 unmodified lines
201201 }
202202
203203 // what should we do if someone calls us while we still think we have a dialog showing???
204− if (_editDialog) {
204+ if (_nonBlockingFormActive) {
205205 qDebug() << "Show Non-Blocking Form called when form already active.";
206206 return;
207207 }