summaryrefslogtreecommitdiff
path: root/launcher
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2013-10-22 18:17:43 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2013-10-22 18:17:43 +0200
commitd4c5d087f0daf6aecb3e6aa7120338d9d85cc512 (patch)
tree0e418b86c35b9167e1724acd5c21ede87e2ea3d4 /launcher
parent879fe4bc293ecbe7aa3ea8de7b4a8076865b53b6 (diff)
parentb50b500e6feca1540bd60af079542a8767ac2ab4 (diff)
Merge with trunk
(bzr r3566.4.32)
Diffstat (limited to 'launcher')
-rw-r--r--launcher/SingleMonitorLauncherIcon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/SingleMonitorLauncherIcon.cpp b/launcher/SingleMonitorLauncherIcon.cpp
index 102652be5..403466683 100644
--- a/launcher/SingleMonitorLauncherIcon.cpp
+++ b/launcher/SingleMonitorLauncherIcon.cpp
@@ -36,7 +36,7 @@ SingleMonitorLauncherIcon::SingleMonitorLauncherIcon(IconType type, int monitor)
void SingleMonitorLauncherIcon::UpdateMonitor()
{
for (unsigned i = 0; i < monitors::MAX; ++i)
- SetVisibleOnMonitor(i, i == monitor_);
+ SetVisibleOnMonitor(i, static_cast<int>(i) == monitor_);
}
void SingleMonitorLauncherIcon::SetMonitor(int monitor)