diff options
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 12 | ||||
| -rw-r--r-- | subsurface-desktop-main.cpp | 5 | ||||
| -rw-r--r-- | subsurface-mobile-main.cpp | 5 |
3 files changed, 2 insertions, 20 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index a20504be2..3e32ec386 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -51,9 +51,6 @@ #define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe) -// a couple of helpers we need -extern bool haveFilesOnCommandLine(); - /* This is the global 'Item position' variable. * it should tell you where to position things up * on the canvas. @@ -522,7 +519,6 @@ void ProfileWidget2::resetZoom() // Currently just one dive, but the plan is to enable All of the selected dives. void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPictures, bool instant) { - static bool firstCall = true; #ifndef SUBSURFACE_MOBILE QElapsedTimer measureDuration; // let's measure how long this takes us (maybe we'll turn of TTL calculation later measureDuration.start(); @@ -564,12 +560,8 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict #endif } - // special handling for the first time we display things - animSpeed = instant ? 0 : qPrefDisplay::animation_speed(); - if (firstCall && haveFilesOnCommandLine()) { - animSpeed = 0; - firstCall = false; - } + // special handling when switching from empty state + animSpeed = instant || currentState == EMPTY ? 0 : qPrefDisplay::animation_speed(); // restore default zoom level resetZoom(); diff --git a/subsurface-desktop-main.cpp b/subsurface-desktop-main.cpp index f3bd05821..f42361538 100644 --- a/subsurface-desktop-main.cpp +++ b/subsurface-desktop-main.cpp @@ -120,11 +120,6 @@ int main(int argc, char **argv) return 0; } -bool haveFilesOnCommandLine() -{ - return filesOnCommandLine; -} - #define VALIDATE_GL_PREFIX "validateGL(): " void validateGL() diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp index 21b0dfe46..7ceebcc5f 100644 --- a/subsurface-mobile-main.cpp +++ b/subsurface-mobile-main.cpp @@ -104,8 +104,3 @@ void set_non_bt_addresses() connectionListModel.addAddress("FTDI"); #endif } - -bool haveFilesOnCommandLine() -{ - return false; -} |