merge with dev

2019-07-23 06:40:40 +02:00
parent ea1de1cf89 c5e9482a29
commit 779ae39f17
131 changed files with 452 additions and 976 deletions
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -247,7 +247,7 @@ bool ImageArea::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
        (*i)->expose (cr);
    }

-    if (options.showInfo && infotext != "") {
+    if (options.showInfo && !infotext.empty()) {
        iBackBuffer.copySurface(cr);
    }