Fixed #750

geo/dll/src/GridDist.cpp

@@ -354,6 +354,7 @@ class GridDistOperator : public Operator
 
 				latFactors.emplace_back(0.5 * factor, 0.5 * sqrt(1+factor*factor));
 			}
+			errorFrame.m_ctx = nullptr;
 		}
 
 		DataWriteLock resLock(res, dms_rw_mode::write_only_mustzero);

qtgui/exe/src/DmsMainWindow.cpp

@@ -838,8 +838,9 @@ void MainWindow::tableView() {
 
 void geoDMSContextMessage(ClientHandle clientHandle, CharPtr msg) {
     assert(IsMainThread());
-    auto dms_main_window = reinterpret_cast<MainWindow*>(clientHandle);
-    dms_main_window->setStatusMessage(msg);
+    auto mw = MainWindow::TheOne();
+    if (mw)
+        mw->setStatusMessage(msg);
     return;
 }
 
@@ -1083,7 +1084,9 @@ SharedStr passed_time_str(CharPtr preFix, time_t passedTime) {
     result = mySSPrintF("%s%s%02d:%02d:%02d "
         , preFix
         , result.c_str()
-        , passedTime / seconds_in_hour, (passedTime / seconds_in_hour) % seconds_in_hour, passedTime % seconds_in_minute
+        , passedTime / seconds_in_hour
+        , (passedTime / seconds_in_minute) % seconds_in_minute
+        , passedTime % seconds_in_minute
     );
     return result;
 }
@@ -1118,14 +1121,14 @@ void MainWindow::end_timing(AbstrMsgGenerator* ach) {
     if (m_processing_records.size() > 10)
         m_processing_records.erase(m_processing_records.begin());
 
-    if (!top_of_records_is_changing)
-        return;
-
     if (m_calculation_times_window->isVisible())
         update_calculation_times_report();
 
+    assert(passedTime <= passed_time(m_processing_records.back()));
+    if (!top_of_records_is_changing)
+        return;
+
     assert(passedTime == passed_time(m_processing_records.back()));
-
     m_LongestProcessingRecordTxt = passed_time_str(" - max processing time: ", passedTime);
 
     updateStatusMessage();
@@ -1359,8 +1362,10 @@ void MainWindow::doViewAction(TreeItem* tiContext, CharPtrRange sAction, QWidget
 }
 
 static bool s_TreeViewRefreshPending = false;
-void AnyTreeItemStateHasChanged(ClientHandle clientHandle, const TreeItem* self, NotificationCode notificationCode) {
-    auto mainWindow = reinterpret_cast<MainWindow*>(clientHandle);
+void AnyTreeItemStateHasChanged(ClientHandle /*clientHandle*/, const TreeItem* self, NotificationCode notificationCode) {
+    auto mainWindow = MainWindow::TheOne();
+    if (!mainWindow)
+        return;
     switch (notificationCode) {
     case NC_Deleting: break; // TODO: remove self from any representation to avoid accessing it's dangling pointer
     case NC_Creating: break;
@@ -1404,15 +1409,19 @@ void AnyTreeItemStateHasChanged(ClientHandle clientHandle, const TreeItem* self,
 
 #include "waiter.h"
 
-void OnStartWaiting(void* clientHandle, AbstrMsgGenerator* ach) {
+void OnStartWaiting(ClientHandle /*clientHandle*/, AbstrMsgGenerator* ach) {
     assert(IsMainThread());
     QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-    reinterpret_cast<MainWindow*>(clientHandle)->begin_timing(ach);
+    auto mw = MainWindow::TheOne();
+    if (mw)
+        mw->begin_timing(ach);
 }
 
-void OnEndWaiting(void* clientHandle, AbstrMsgGenerator* ach) {
+void OnEndWaiting(ClientHandle /*clientHandle*/, AbstrMsgGenerator* ach) {
     QGuiApplication::restoreOverrideCursor();
-    reinterpret_cast<MainWindow*>(clientHandle)->end_timing(ach);
+    auto mw = MainWindow::TheOne();
+    if (mw)
+        mw->end_timing(ach);
 }
 
 void MainWindow::setupDmsCallbacks() {

qtgui/exe/src/DmsMainWindow.h

@@ -258,8 +258,8 @@ public slots:
     void on_status_msg_changed(const QString& msg);
     void updateStatusMessage();
 
-    void begin_timing(AbstrMsgGenerator* ach); friend void OnStartWaiting(void* clientHandle, AbstrMsgGenerator* ach);
-    void end_timing(AbstrMsgGenerator* ach);   friend void OnEndWaiting  (void* clientHandle, AbstrMsgGenerator* ach);
+    void begin_timing(AbstrMsgGenerator* ach); friend void OnStartWaiting(ClientHandle clientHandle, AbstrMsgGenerator* ach);
+    void end_timing(AbstrMsgGenerator* ach);   friend void OnEndWaiting  (ClientHandle clientHandle, AbstrMsgGenerator* ach);
 
 
     static void OnViewAction(const TreeItem* tiContext, CharPtr sAction, Int32 nCode, Int32 x, Int32 y, bool doAddHistory, bool isUrl, bool mustOpenDetailsPage);

qtgui/exe/src/DmsViewArea.cpp

@@ -73,7 +73,7 @@ LPCWSTR RegisterViewAreaWindowClass(HINSTANCE instance) {
     return className;
 }
 
-void DMS_CONV OnStatusText(void* clientHandle, SeverityTypeID st, CharPtr msg) {
+void DMS_CONV OnStatusText(ClientHandle clientHandle, SeverityTypeID st, CharPtr msg) {
     auto* dva = reinterpret_cast<QDmsViewArea*>(clientHandle);
     assert(dva);
     if (st == SeverityTypeID::ST_MajorTrace) {

shv/dll/src/Controllers.cpp

@@ -536,6 +536,8 @@ void InfoController::SelectFocusElem(LayerSet* ls, const CrdPoint& worldPoint, E
 
 	if (lButtonUp || lButtonDblClk)
 	{
+		ObjectMsgGenerator thisMsgGenerator(nullptr, "SelectPoint");
+		Waiter waiter(&thisMsgGenerator);
 		GraphicLayer* layer = ls->GetActiveLayer();
 		if (layer)
 			SelectPoint(layer, worldPoint, eventID);

shv/dll/src/Waiter.cpp

@@ -48,8 +48,13 @@ void Waiter::end()
 		return;
 
 	for (const auto& we : s_WaitingCallbacks)
-		if (std::get<1>(we))
-			std::get<1>(we)(std::get<2>(we), m_ContextGenerator);
+	{
+		auto onEndWaitingFunc = std::get<1>(we);
+		if (!onEndWaitingFunc)
+			continue;
+		auto clientHandle = std::get<2>(we);
+		onEndWaitingFunc(clientHandle, m_ContextGenerator);
+	}
 	SetBusy(false);
 }