[PATCH 2/2] dive merging: make sure that the dive is actually replotted after merging

Linus Torvalds torvalds at linux-foundation.org
Tue Sep 22 19:14:00 PDT 2015


From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue, 22 Sep 2015 19:09:49 -0700
Subject: [PATCH 2/2] dive merging: make sure that the dive is actually replotted after merging

This patch is disgusting: we call the "planCanceled" method to make sure
that the dive profile window is updated.  That makes no sense, since
we're not canceling any dive plans, but that method happens to repaint
the profile, and there is no "good" name for it.

Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

Start - this actually makes current subsurface act well with your 
test-case.  But it's a disgusting hack. Oh well.

 qt-ui/divelistview.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index 39eab9c7ad01..261368a3d0f4 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -613,6 +613,7 @@ void DiveListView::mergeDives()
 		}
 	}
 	MainWindow::instance()->refreshDisplay();
+	MainWindow::instance()->planCanceled();
 }
 
 void DiveListView::renumberDives()
-- 
2.6.0.rc1.16.g1962994



More information about the subsurface mailing list