From f9a8019ce38f3d0ac8e44c126dfbd79912b7c291 Mon Sep 17 00:00:00 2001
From: hpsolo <>
Date: Wed, 30 May 2001 00:13:46 +0000
Subject: [PATCH] Fixed a minor error in the Linux vid modes

---
 zsnes/src/cfgload.asm     |  2 +-
 zsnes/src/linux/sdllink.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm
index ff1246a0..e72b996c 100644
--- a/zsnes/src/cfgload.asm
+++ b/zsnes/src/cfgload.asm
@@ -599,7 +599,7 @@ db 'VideoMode = %U',13,10
 db '',13,10
 %elifdef __LINUX__
 %ifdef __OPENGL__
-db '; Video Mode, 0 - 7',13,10
+db '; Video Mode, 0 - 6',13,10
 %else
 db '; Video Mode, 0 - 3',13,10
 %endif
diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index 1a106472..41558988 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -140,6 +140,7 @@ int UseOpenGL = 0;
 int glfilters = GL_NEAREST;
 extern Uint8 BilinearFilter;
 extern Uint8 FilteredGUI;
+extern Uint8 GUIOn2;
 #endif
 extern unsigned char cvidmode;
 DWORD vidbuff_w, vidbuff_h;
@@ -1113,8 +1114,14 @@ void drawscreenwin(void)
     for (j = 0; j<224; j++) {
       memcpy(glvidbuffer + 256*j, (short *) (vidbuffer) + 16 + 288 + (256+32)*j, 256*2);
     }
-    if (BilinearFilter && FilteredGUI) glfilters = GL_LINEAR; else glfilters = GL_NEAREST;
-    if (FullScreen && cvidmode != 7) ratiox = 0.875; else ratiox = 1.0;
+    if (BilinearFilter) {
+      glfilters = GL_LINEAR;
+      if (GUIOn2 && !FilteredGUI) glfilters = GL_NEAREST;
+    } else {
+      glfilters = GL_NEAREST;
+    }
+
+    if (FullScreen) ratiox = 0.875; else ratiox = 1.0;
     
     glClear(GL_COLOR_BUFFER_BIT);
     glLoadIdentity();