merge with dev

2018-01-19 13:53:37 +01:00
parent 4feb663f63 8622efce00
commit 8728e3f3f3
2 changed files with 7 additions and 6 deletions
--- a/rtgui/crophandler.cc
+++ b/rtgui/crophandler.cc
@@ -426,11 +426,11 @@ bool CropHandler::getWindow (int& cwx, int& cwy, int& cww, int& cwh, int& cskip)
    cwh = cropH;

    // hack: if called before first size allocation the size will be 0
-    if (cww < 10) {
+    if (cww == 0) {
        cww = 10;
    }

-    if (cwh < 32) {
+    if (cwh == 0) {
        cwh = 32;
    }