From 7f7e84b6968a464bad54f9ee87a2a35ddf3d9ca4 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 4 Jan 2015 14:41:50 +0000
Subject: Simplified Fl_X::flush() for GL windows.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10507 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 323a634bf..34a2908af 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2767,15 +2767,14 @@ void Fl_Window::fullscreen_off_x(int X, int Y, int W, int H) {
  */ 
 void Fl_X::flush()
 {
-  if (through_drawRect) {
-    if (w->as_gl_window()) {
-      w->flush();
-    } else {
-      make_current_counts = 1;
-      w->flush();
-      make_current_counts = 0;
-      Fl_X::q_release_context();
-    }
+  if (w->as_gl_window()) {
+    w->flush();
+    return;
+  } else if (through_drawRect) {
+    make_current_counts = 1;
+    w->flush();
+    make_current_counts = 0;
+    Fl_X::q_release_context();
     return;
   }
   // have Cocoa immediately redraw the window's view
-- 
cgit v1.2.3