[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita] libs/ui/opengl: Remove debugging line & improve message
From:       Boudewijn Rempt <null () kde ! org>
Date:       2017-02-27 17:50:51
Message-ID: E1ciPRj-0005Mb-Oj () code ! kde ! org
[Download RAW message or body]

Git commit ff34bdbed1718d0f53c81af61acaa7c9bb0bbffd by Boudewijn Rempt.
Committed on 27/02/2017 at 17:50.
Pushed by rempt into branch 'master'.

Remove debugging line & improve message

M  +2    -2    libs/ui/opengl/kis_opengl.cpp
M  +0    -2    libs/ui/opengl/kis_opengl_canvas2.cpp

https://commits.kde.org/krita/ff34bdbed1718d0f53c81af61acaa7c9bb0bbffd

diff --git a/libs/ui/opengl/kis_opengl.cpp b/libs/ui/opengl/kis_opengl.cpp
index a05442a655c..9932779cb64 100644
--- a/libs/ui/opengl/kis_opengl.cpp
+++ b/libs/ui/opengl/kis_opengl.cpp
@@ -160,9 +160,9 @@ void KisOpenGL::initializeContext(QOpenGLContext *ctx)
         QMessageBox::information(0,
                                  i18nc("@title:window", "Krita: Warning"),
                                  i18n("You have an Intel(R) HD Graphics video \
                adapter.\n"
-                                      "If you experience problems like a black or \
blank screen," +                                      "If you experience problems \
                like a crash, a black or blank screen,"
                                       "please update your display driver to the \
                latest version.\n\n"
-                                      "You can also disable OpenGL rendering in \
Krita's Settings.\n")); +                                      "If Krita crashes, it \
will disable OpenGL rendering. Please restart Krita in that case.\n After updating \
your drivers you can re-enable OpenGL in Krita's Settings.\n"));  \
cfg.writeEntry("WarnedAboutIntel", true);  }
 #endif
diff --git a/libs/ui/opengl/kis_opengl_canvas2.cpp \
b/libs/ui/opengl/kis_opengl_canvas2.cpp index 87f4c2f1153..2ef938f379e 100644
--- a/libs/ui/opengl/kis_opengl_canvas2.cpp
+++ b/libs/ui/opengl/kis_opengl_canvas2.cpp
@@ -130,8 +130,6 @@ KisOpenGLCanvas2::KisOpenGLCanvas2(KisCanvas2 *canvas,
     , KisCanvasWidgetBase(canvas, coordinatesConverter)
     , d(new Private())
 {
-    abort();
-
     KisConfig cfg;
     cfg.setCanvasState("OPENGL_STARTED");
 


[prev in list] [next in list] [prev in thread] [next in thread]