Merge branch 'master' into gtk3

2016-12-05 12:01:45 +01:00
parent fd41f4dcd5 976fc087bd
commit 5ecd50b1cd
3 changed files with 19 additions and 12 deletions
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -526,7 +526,7 @@ public:
    // you have to check if the surface is created thanks to surfaceCreated before starting to draw on it
    bool surfaceCreated()
    {
-        return surface;
+        return static_cast<bool>(surface);
    }
    Cairo::RefPtr<Cairo::ImageSurface> getSurface()
    {