Skip to content

Commit a91e730

Browse files
committed
removed debug code from the hammer loop
1 parent e0fb1a4 commit a91e730

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

apps/cmstapp/code/control_box/controlbox.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -954,14 +954,13 @@ void ControlBox::toggleTrayIcon(bool b_checked)
954954
ui.pushButton_minimize->setDisabled(false);
955955
// QT5.3 and XFCE don't play nicely. Hammer the XFCE tray up to
956956
// maxtries to get a valid icon geometry
957-
const int maxtries = 250;
957+
const int maxtries = 125;
958958
for (int i = 0; i < maxtries; ++i) {
959959
trayicon->setVisible(true);
960960
if (trayicon->geometry().left() > 0 && trayicon->geometry().top() > 0) return;
961-
qDebug() << "Failed at attempt " << i << "to show the tray icon";
962961
trayicon->setVisible(false);
963962
} // hammer loop
964-
qDebug() << "Failed to make a valid icon in " << maxtries << "tries.";
963+
qDebug() << QString("Failed to get a valid icon from the systemtray in %1 tries").arg(maxtries);
965964
ui.pushButton_minimize->setDisabled(true);
966965
} // else
967966
} //if

apps/resource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
3434

3535
///////////////////////////////// Program Values ///////////////////////
3636
// Program Info
37-
#define VERSION "14.11.16-3"
37+
#define VERSION "14.11.17-1"
3838
#define RELEASE_DATE "15 October 2014"
3939
#define COPYRIGHT_DATE "2013-2014"
4040

0 commit comments

Comments
 (0)