From 98364b324c7439b57120db191f95927f4fc10572 Mon Sep 17 00:00:00 2001
From: spog <spog>
Date: Mon, 20 Feb 2006 21:48:46 +0000
Subject: [PATCH] fixed crash on disabling lighting

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@15 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
 CHANGES                      |  4 ++++
 libs/gtkutil/accelerator.cpp |  4 ++--
 libs/gtkutil/accelerator.h   |  4 ++--
 plugins/shaders/shaders.cpp  |  1 +
 radiant/camwindow.cpp        |  1 +
 radiant/gtkmisc.cpp          | 10 +++++-----
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7165be64..77ca4e97 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+20/02/2006
+SPoG
+- Fixed crash when disabling lighting for a second time.
+
 19/02/2006
 SPoG
 - Fixed crash when loading invalid ASE models.
diff --git a/libs/gtkutil/accelerator.cpp b/libs/gtkutil/accelerator.cpp
index a4fc0578..6a63fddc 100644
--- a/libs/gtkutil/accelerator.cpp
+++ b/libs/gtkutil/accelerator.cpp
@@ -528,7 +528,7 @@ GClosure* global_accel_group_find(Accelerator accelerator)
   return 0;
 }
 
-void command_connect_accelerator(const Accelerator& accelerator, const Callback& callback)
+void global_accel_group_connect(const Accelerator& accelerator, const Callback& callback)
 {
   if(accelerator.key != 0)
   {
@@ -536,7 +536,7 @@ void command_connect_accelerator(const Accelerator& accelerator, const Callback&
   }
 }
 
-void command_disconnect_accelerator(const Accelerator& accelerator, const Callback& callback)
+void global_accel_group_disconnect(const Accelerator& accelerator, const Callback& callback)
 {
   if(accelerator.key != 0)
   {
diff --git a/libs/gtkutil/accelerator.h b/libs/gtkutil/accelerator.h
index b34a98c1..e4bd5a84 100644
--- a/libs/gtkutil/accelerator.h
+++ b/libs/gtkutil/accelerator.h
@@ -71,8 +71,8 @@ void global_accel_destroy();
 
 GClosure* global_accel_group_find(Accelerator accelerator);
 
-void command_connect_accelerator(const Accelerator& accelerator, const Callback& callback);
-void command_disconnect_accelerator(const Accelerator& accelerator, const Callback& callback);
+void global_accel_group_connect(const Accelerator& accelerator, const Callback& callback);
+void global_accel_group_disconnect(const Accelerator& accelerator, const Callback& callback);
 
 
 class Command
diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index 3bfa7296..77326810 100644
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -1177,6 +1177,7 @@ public:
       {
         GlobalTexturesCache().release((*i).texture());
       }
+      m_layers.clear();
     }
   }
 
diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 5d5bea9f..057e6aa8 100644
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -1930,6 +1930,7 @@ void Camera_registerPreferencesPage()
 
 typedef FreeCaller1<bool, CamWnd_Move_Discrete_Import> CamWndMoveDiscreteImportCaller;
 
+/// \brief Initialisation for things that have the same lifespan as this module.
 void CamWnd_Construct()
 {
   GlobalCommands_insert("CenterView", FreeCaller<GlobalCamera_ResetAngles>(), Accelerator(GDK_End));
diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index d5881981..f3175259 100644
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -54,27 +54,27 @@ void command_connect_accelerator(const char* name)
 {
   const Command& command = GlobalCommands_find(name);
   GlobalShortcuts_register(name);
-  command_connect_accelerator(command.m_accelerator, command.m_callback);
+  global_accel_group_connect(command.m_accelerator, command.m_callback);
 }
 
 void command_disconnect_accelerator(const char* name)
 {
   const Command& command = GlobalCommands_find(name);
-  command_disconnect_accelerator(command.m_accelerator, command.m_callback);
+  global_accel_group_disconnect(command.m_accelerator, command.m_callback);
 }
 
 void toggle_add_accelerator(const char* name)
 {
   const Toggle& toggle = GlobalToggles_find(name);
   GlobalShortcuts_register(name);
-  command_connect_accelerator(toggle.m_command.m_accelerator, toggle.m_command.m_callback);
+  global_accel_group_connect(toggle.m_command.m_accelerator, toggle.m_command.m_callback);
 }
 
 GtkCheckMenuItem* create_check_menu_item_with_mnemonic(GtkMenu* menu, const char* mnemonic, const char* commandName)
 {
   GlobalShortcuts_register(commandName);
   const Toggle& toggle = GlobalToggles_find(commandName);
-  command_connect_accelerator(toggle.m_command.m_accelerator, toggle.m_command.m_callback);
+  global_accel_group_connect(toggle.m_command.m_accelerator, toggle.m_command.m_callback);
   return create_check_menu_item_with_mnemonic(menu, mnemonic, toggle);
 }
 
@@ -82,7 +82,7 @@ GtkMenuItem* create_menu_item_with_mnemonic(GtkMenu* menu, const char *mnemonic,
 {
   GlobalShortcuts_register(commandName);
   const Command& command = GlobalCommands_find(commandName);
-  command_connect_accelerator(command.m_accelerator, command.m_callback);
+  global_accel_group_connect(command.m_accelerator, command.m_callback);
   return create_menu_item_with_mnemonic(menu, mnemonic, command);
 }
 
-- 
2.39.2