X-Git-Url: http://git.osdn.net/view?p=molby%2FMolby.git;a=blobdiff_plain;f=Scripts%2Fstartup.rb;fp=Scripts%2Fstartup.rb;h=7d2128202960f03d8bd351dd4a893e6f384a2ca0;hp=6faf5e374e94750bd9539d0d95d4eaad76f37ad3;hb=8da5d98fb42924c2de42af209b0ad710fb52b8ea;hpb=56959b30bdf28a5d707182d2f5a544c0eb528682

diff --git a/Scripts/startup.rb b/Scripts/startup.rb
index 6faf5e3..7d21282 100755
--- a/Scripts/startup.rb
+++ b/Scripts/startup.rb
@@ -36,6 +36,20 @@ case RUBY_PLATFORM
 	$home_directory = ENV['HOME']
 end
 
+if $platform == "win"
+  #  Avoid unexpected error when the global setting string has bad encoding
+  module Kernel
+    alias __get_global_settings get_global_settings
+    def get_global_settings(s)
+      ss = __get_global_settings(s)
+      if ss.kind_of?(String) && ss.encoding == Encoding.find("ASCII-8BIT")
+        ss = ss.force_encoding('Shift_JIS') rescue ss.force_encoding('UTF-8') rescue ""
+      end
+      return ss
+    end
+  end
+end
+
 sdir = get_global_settings("global.scratch_dir")
 if sdir == nil || sdir == ""
   sdir = $home_directory