diff --git a/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp b/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp index 91adf82..634283c 100644 --- a/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -86,6 +86,8 @@ void ViewerInstructors::slot_checkTryBlockResult(bool result, QString type) { if(type == "EditorInstructors") { + emit signal_needShowWait(false); + if(result) {//Одобрено dialog_EditorInstructors(); @@ -161,8 +163,6 @@ void ViewerInstructors::updateButtons() void ViewerInstructors::dialog_EditorInstructors() { - emit signal_needShowWait(false); - dlgRedactor = new DialogRedactorInstructors(connectorToServer, adminMode, this); dlgRedactor->exec(); diff --git a/LibInstructorsAndTrainees/settings/dialogsettings.cpp b/LibInstructorsAndTrainees/settings/dialogsettings.cpp index 320cb56..9d4c268 100644 --- a/LibInstructorsAndTrainees/settings/dialogsettings.cpp +++ b/LibInstructorsAndTrainees/settings/dialogsettings.cpp @@ -263,8 +263,6 @@ void DialogSettings::on_DialogSettings_accepted() void DialogSettings::dialog_VersionControl() { - waitAnimationWidget->hideWithStop(); - dlgVersionControl = new DialogVersionControl(connectorToServer, this); dlgVersionControl->initialize(connectorToServer->getLoginName()); dlgVersionControl->exec(); @@ -284,6 +282,8 @@ void DialogSettings::slot_checkTryBlockResult(bool result, QString type) { if(type == "VersionControl") { + waitAnimationWidget->hideWithStop(); + if(result) {//Одобрено dialog_VersionControl(); diff --git a/LibInstructorsAndTrainees/trainees/viewertrainees.cpp b/LibInstructorsAndTrainees/trainees/viewertrainees.cpp index 64623d4..5db27eb 100644 --- a/LibInstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/LibInstructorsAndTrainees/trainees/viewertrainees.cpp @@ -120,6 +120,8 @@ void ViewerTrainees::slot_checkTryBlockResult(bool result, QString type) { if(type == "EditorTrainees") { + emit signal_needShowWait(false); + if(result) {//Одобрено dialog_EditorTrainees(); @@ -254,8 +256,6 @@ void ViewerTrainees::updateButtons() void ViewerTrainees::dialog_EditorTrainees() { - emit signal_needShowWait(false); - dlgRedactor = new DialogRedactorTrainees(connectorToServer, adminMode, this); dlgRedactor->exec();