From 1d761114b69b9dfd14c1d0d65b18801463fe7e9d Mon Sep 17 00:00:00 2001
From: ansstuff <ansstuff@users.sf.net>
Date: Sat, 24 Mar 2012 14:07:59 +0000
Subject: [PATCH] * Taseditor: fixed bug with popup screenshots * updated lua
 scripts

---
 .../taseditor/InputDisplay_for_Selection.lua           | 10 ++++++----
 output/luaScripts/taseditor/InvertSelection.lua        |  2 ++
 output/luaScripts/taseditor/RecordBackwards.lua        |  2 ++
 output/luaScripts/taseditor/ShowNotes.lua              |  2 ++
 output/luaScripts/taseditor/TrackNoise.lua             |  2 ++
 src/drivers/win/taseditor/bookmarks.cpp                |  1 +
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/output/luaScripts/taseditor/InputDisplay_for_Selection.lua b/output/luaScripts/taseditor/InputDisplay_for_Selection.lua
index f3a359f7..50f44d5b 100644
--- a/output/luaScripts/taseditor/InputDisplay_for_Selection.lua
+++ b/output/luaScripts/taseditor/InputDisplay_for_Selection.lua
@@ -17,10 +17,10 @@
 ---------------------------------------------------------------------------
 
 pads = {
-	{num=1, on=true, color="red", x=9, y=200, w=34, h=10},
-	{num=2, on=false, color="yellow", x=54, y=200, w=34, h=10},
-	{num=3, on=false, color="green", x=99, y=200, w=34, h=10},
-	{num=4, on=false, color="orange", x=144, y=200, w=34, h=10}
+	{num=1, on=true, color="red", x=50, y=200, w=34, h=10},
+	{num=2, on=true, color="yellow", x=90, y=200, w=34, h=10},
+	{num=3, on=false, color="green", x=130, y=200, w=34, h=10},
+	{num=4, on=false, color="orange", x=170, y=200, w=34, h=10}
 }
 
 buttons = {
@@ -54,6 +54,8 @@ function draw_joypads()
 				end
 			end
 		end
+	else
+		gui.text(1, 9, "TAS Editor is not engaged.");
 	end
 end
 
diff --git a/output/luaScripts/taseditor/InvertSelection.lua b/output/luaScripts/taseditor/InvertSelection.lua
index 3953cd3b..ac9938dd 100644
--- a/output/luaScripts/taseditor/InvertSelection.lua
+++ b/output/luaScripts/taseditor/InvertSelection.lua
@@ -21,6 +21,8 @@ function display_selection()
 		else
 			gui.text(0, 10, "Selection: no");
 		end
+	else
+		gui.text(1, 9, "TAS Editor is not engaged.");
 	end
 end
 
diff --git a/output/luaScripts/taseditor/RecordBackwards.lua b/output/luaScripts/taseditor/RecordBackwards.lua
index 269b3d83..8e30376e 100644
--- a/output/luaScripts/taseditor/RecordBackwards.lua
+++ b/output/luaScripts/taseditor/RecordBackwards.lua
@@ -88,6 +88,8 @@ function reversed_recorder()
 			end
 		end
 		playback_last_position = playback_position;
+	else
+		gui.text(1, 9, "TAS Editor is not engaged.");
 	end
 end
 
diff --git a/output/luaScripts/taseditor/ShowNotes.lua b/output/luaScripts/taseditor/ShowNotes.lua
index 85244dfe..1fb61403 100644
--- a/output/luaScripts/taseditor/ShowNotes.lua
+++ b/output/luaScripts/taseditor/ShowNotes.lua
@@ -55,6 +55,8 @@ function ShowNotes()
 			note = taseditor.getnote(taseditor.getmarker(selection_position));
 			DisplayText(1, 190, note, 50);
 		end
+	else
+		gui.text(1, 9, "TAS Editor is not engaged.");
 	end
 end
 
diff --git a/output/luaScripts/taseditor/TrackNoise.lua b/output/luaScripts/taseditor/TrackNoise.lua
index 064433c6..1160f9c7 100644
--- a/output/luaScripts/taseditor/TrackNoise.lua
+++ b/output/luaScripts/taseditor/TrackNoise.lua
@@ -53,6 +53,8 @@ function track_changes()
 			last_frame = current_frame;
 			last_frame_indicator_value = indicator;
 		end
+	else
+		gui.text(1, 9, "TAS Editor is not engaged.");
 	end
 end
 
diff --git a/src/drivers/win/taseditor/bookmarks.cpp b/src/drivers/win/taseditor/bookmarks.cpp
index fcaf5c73..5f1b2fa3 100644
--- a/src/drivers/win/taseditor/bookmarks.cpp
+++ b/src/drivers/win/taseditor/bookmarks.cpp
@@ -487,6 +487,7 @@ void BOOKMARKS::MouseMove(int new_x, int new_y)
 }
 void BOOKMARKS::FindItemUnderMouse()
 {
+	item_under_mouse = ITEM_UNDER_MOUSE_NONE;
 	if (mouse_x > list_row_left)
 	{
 		item_under_mouse = (mouse_y - list_row_top) / list_row_height;