From 946e44f786311b367a0f66de424e42330de7cbc0 Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 2 Nov 2009 12:23:10 +0000
Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@34885
 e17a0e51-4ae3-4d35-97c3-1a29b211df97

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4ba36dc4..9c40108e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ November 2, 2009 Wei Mingzhi <weimingzhi@gmail.com>
  * macosx/plugins/CDDeviceInterface/src/PlugCD.c: Likewise.
  * macosx/plugins/HIDInput/src/PSEmu_Plugin_Defs.h: Removed.
  * macosx/plugins/CDDeviceInterface/src/PSEmu_Plugin_Defs.h: Removed.
+ * macosx/PcsxController.m: Don't allow starting game when Preferences dialog
+   box is opened. Don't allow opening the Preferences dialog when game is
+   running.
 
 November 1, 2009 Wei Mingzhi <weimingzhi@gmail.com>
 
-- 
cgit v1.2.3