Fixed a minor merge screw-up and corrected IndicatorButtonPanel dragging to work...

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index e0dd89f..d40e185 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent)
       m_password(),
       m_webView(0),
       m_fullScreenButton(0),
-      m_indicatorButton(0),
+      m_indicatorButtonPanel(0),
       m_mapScale(0),
       m_cookieJar(0)
 {