From d552f0bfeab0d462ebed2c925a712281488ecca8 Mon Sep 17 00:00:00 2001
From: toshinagata1964 <toshinagata1964@a2be9bc6-48de-4e38-9406-05402d4bc13c>
Date: Thu, 16 Oct 2014 02:33:26 +0000
Subject: [PATCH] Crash if Molby is invoked by dragging & dropping a LOG file.
 Fixed.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@580 a2be9bc6-48de-4e38-9406-05402d4bc13c
---
 wxSources/ProgressFrame.cpp  |  3 ++-
 wxSources/modalwindow_osx.mm | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/wxSources/ProgressFrame.cpp b/wxSources/ProgressFrame.cpp
index f7daf11..b2b6805 100755
--- a/wxSources/ProgressFrame.cpp
+++ b/wxSources/ProgressFrame.cpp
@@ -116,7 +116,8 @@ ProgressFrame::CheckInterrupt()
 
 #if 1
 	wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-	loop->YieldFor(wxEVT_CATEGORY_UI);
+	if (loop != NULL)
+		loop->YieldFor(wxEVT_CATEGORY_UI);
 #else
 #if __WXMAC__
 	::wxYield();
diff --git a/wxSources/modalwindow_osx.mm b/wxSources/modalwindow_osx.mm
index f5bacb7..8483c78 100644
--- a/wxSources/modalwindow_osx.mm
+++ b/wxSources/modalwindow_osx.mm
@@ -34,3 +34,14 @@ MacGetActiveWindow(void)
 {
 	return [NSApp mainWindow];
 }
+
+/*
+int
+MacCheckEscapeKeyPressed(void)
+{
+	NSEvent *ep = [NSApp nextEventMatchingMask:NSKeyDownMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES];
+	if (ep != nil && [[ep charactersIgnoringModifiers] characterAtIndex:0] == 0x1e) {
+		return 1;
+	} else return 0;
+}
+*/
-- 
2.11.0