[Vice-emu-commit] SF.net SVN: vice-emu: [18922] branches/marco/ports/vice/src

Revision: 18922
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18922&view=rev
Author:   blackystardust
Date:     2008-06-27 09:33:18 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
Added a fix to a possible crash of the win32 port when loading settings that turned on the poor performance new PAL emu combo, and added support for opensolaris to the make-bindist.sh script.

Modified Paths:
--------------
    branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
    branches/marco/ports/vice/src/video/video-resources.c

Modified: branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh
===================================================================
--- branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-27 00:12:07 UTC (rev 18921)
+++ branches/marco/ports/vice/src/arch/unix/sco_sol/make-bindist.sh	2008-06-27 16:33:18 UTC (rev 18922)
@@ -157,6 +157,10 @@
     if test x"$arch_version" = "x5.10"; then
       arch_version=sol10
     fi
+
+    if test x"$arch_version" = "x5.11"; then
+      arch_version=sol11
+    fi
   else
     arch_cpu=x86
 

Modified: branches/marco/ports/vice/src/video/video-resources.c
===================================================================
--- branches/marco/ports/vice/src/video/video-resources.c	2008-06-27 00:12:07 UTC (rev 18921)
+++ branches/marco/ports/vice/src/video/video-resources.c	2008-06-27 16:33:18 UTC (rev 18922)
@@ -626,6 +626,12 @@
     if (pal_enabled)
         resources_get_int("PALMode", &pal_mode);
 
+    if (video_current_canvas==NULL)
+      return;
+
+    if (video_current_canvas->videoconfig==NULL)
+      return;
+
     if (pal_enabled != 0 && pal_mode == 2 &&
         video_current_canvas->videoconfig->fullscreen_enabled == 0 &&
         video_current_canvas->videoconfig->doublescan != 0 &&


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.