diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-04-24 20:48:05 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-04-24 20:48:09 +0300 |
| commit | c9c62efe5f07d16d98f74755d1f6c20fe3e60310 (patch) | |
| tree | 9bcb9771bb3ad8bc0ac80a15cfc5fe426e3a8555 /src/mir_app | |
| parent | 7a5371da53383fede5a47daf78a7300d2d42a154 (diff) | |
fixes #4378 (Падение при переходе в настройки плагина сообщений после выгрузки Scriver)
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/options.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp index 4599eb44b3..e92e94ec80 100644 --- a/src/mir_app/src/options.cpp +++ b/src/mir_app/src/options.cpp @@ -1089,6 +1089,7 @@ public: delete it;
m_arOpd.remove(idx);
}
+ m_arDeleted.destroy();
RebuildPageTree();
}
@@ -1114,15 +1115,16 @@ public: void DynamicAddPage(OptionsPage *pPage)
{
OptionsPageData *opd = new OptionsPageData(*pPage);
- if (opd->pDialog == nullptr) // smth went wrong
+ if (opd->pDialog == nullptr) { // smth went wrong
delete opd;
- else {
- if (m_bInsideApply)
- m_arInserted.insert(opd);
- else
- m_arOpd.insert(opd);
- m_timerRebuild.Start(50);
+ return;
}
+
+ if (m_bInsideApply)
+ m_arInserted.insert(opd);
+ else
+ m_arOpd.insert(opd);
+ m_timerRebuild.Start(50);
}
void KillAccount(PROTO_INTERFACE *ppro)
|