Merge branch 'master' into patch-3

effects/shaders/chromakey.frag

@@ -42,7 +42,7 @@ float colorclose(float Cb_p,float Cr_p,float Cb_key,float Cr_key,float tola,floa
 	if (temp < tolb) {return ((temp-tola)/(tolb-tola));} 
 	return (1.0); 
 }
- 
+
 void main(void) {
 	float cb_key = rgb2cb(key_color);
 	float cr_key = rgb2cr(key_color);

main.cpp

@@ -125,7 +125,10 @@ int main(int argc, char *argv[]) {
   QCoreApplication::setOrganizationName("olivevideoeditor.org");
   QCoreApplication::setOrganizationDomain("olivevideoeditor.org");
   QCoreApplication::setApplicationName("Olive");
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
   QGuiApplication::setDesktopFileName("org.olivevideoeditor.Olive");
+#endif
 
   MainWindow w(nullptr);
 

ui/viewerwidget.cpp

@@ -545,8 +545,6 @@ void ViewerWidget::paintGL() {
 
     tex_lock->lock();
 
-    makeCurrent();
-
     // clear to solid black
     glClearColor(0.0, 0.0, 0.0, 0.0);
     glClear(GL_COLOR_BUFFER_BIT);