Merge branch 'dev' into spot-removal-tool

2017-11-26 00:32:20 +01:00
parent 20a0fb7af9 bfb27bee14
commit 12ac1e2897
11 changed files with 293 additions and 176 deletions
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -400,7 +400,7 @@ void ThumbBrowserEntryBase::resize (int h)
    MYWRITERLOCK(l, lockRW);

    height = h;
-    int old_preh = preh, old_width = width;
+    int old_preh = preh;

    // dimensions of the button set
    int bsw = 0, bsh = 0;