From afd4675104a0f379e75c472f42481f412a447ca1 Mon Sep 17 00:00:00 2001
From: ansstuff <ansstuff@users.sf.net>
Date: Tue, 25 Dec 2012 15:54:12 +0000
Subject: [PATCH] Taseditor: fixed Greenzone saving while emulator is unpaused

---
 src/drivers/win/taseditor/greenzone.cpp | 4 +++-
 src/drivers/win/taseditor/piano_roll.h  | 2 +-
 src/drivers/win/video.cpp               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/drivers/win/taseditor/greenzone.cpp b/src/drivers/win/taseditor/greenzone.cpp
index c360e703..b7bc1241 100644
--- a/src/drivers/win/taseditor/greenzone.cpp
+++ b/src/drivers/win/taseditor/greenzone.cpp
@@ -228,6 +228,7 @@ void GREENZONE::save(EMUFILE *os, bool really_save)
 {
 	if (really_save)
 	{
+		CollectCurrentState();		// in case the project is being saved before the greenzone.update() was called within current frame
 		// write "GREENZONE" string
 		os->fwrite(greenzone_save_id, GREENZONE_ID_LEN);
 		// write LagLog
@@ -236,7 +237,6 @@ void GREENZONE::save(EMUFILE *os, bool really_save)
 		write32le(greenZoneCount, os);
 		// write Playback cursor position
 		write32le(currFrameCounter, os);
-		CollectCurrentState();
 		// write savestates
 		int frame, size;
 		int last_tick = 0;
@@ -374,6 +374,8 @@ bool GREENZONE::load(EMUFILE *is, unsigned int offset)
 				} else
 				{
 					// load this savestate
+					if ((int)savestates.size() <= frame)
+						savestates.resize(frame + 1);
 					savestates[frame].resize(size);
 					if ((int)is->fread(&savestates[frame][0], size) < size) break;
 					prev_frame = frame;			// successfully read one Greenzone frame info
diff --git a/src/drivers/win/taseditor/piano_roll.h b/src/drivers/win/taseditor/piano_roll.h
index b7f11da3..3fbb6205 100644
--- a/src/drivers/win/taseditor/piano_roll.h
+++ b/src/drivers/win/taseditor/piano_roll.h
@@ -103,7 +103,7 @@ enum DRAG_MODES
 #define NORMAL_BACKGROUND_COLOR 0xFFFFFF
 
 #define NORMAL_FRAMENUM_COLOR 0xFFFFFF
-#define NORMAL_INPUT_COLOR1 0xE9E9E9
+#define NORMAL_INPUT_COLOR1 0xEDEDED
 #define NORMAL_INPUT_COLOR2 0xE2E2E2
 
 #define GREENZONE_FRAMENUM_COLOR 0xDDFFDD
diff --git a/src/drivers/win/video.cpp b/src/drivers/win/video.cpp
index fc16091f..7820cb36 100644
--- a/src/drivers/win/video.cpp
+++ b/src/drivers/win/video.cpp
@@ -1208,7 +1208,7 @@ BOOL CALLBACK VideoConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 		"1600x1200 6x,5y",
 		"800x600 Stretched"
 	};
-	int x;
+	//int x;
 
 	switch(uMsg)
 	{