ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed crash on disabling lighting

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@15 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-02-20 21:48:46 +00:00
parent 02d9607a65
commit 98364b324c
6 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,6 +1,10 @@
This is the changelog for developers, != changelog for the end user This is the changelog for developers, != changelog for the end user
that we distribute with the binaries. (see changelog) that we distribute with the binaries. (see changelog)
20/02/2006
SPoG
- Fixed crash when disabling lighting for a second time.
19/02/2006 19/02/2006
SPoG SPoG
- Fixed crash when loading invalid ASE models. - Fixed crash when loading invalid ASE models.

4
libs/gtkutil/accelerator.cpp
View file

@ -528,7 +528,7 @@ GClosure* global_accel_group_find(Accelerator accelerator)
return 0; 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) 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) if(accelerator.key != 0)
{ {

4
libs/gtkutil/accelerator.h
View file

@ -71,8 +71,8 @@ void global_accel_destroy();
GClosure* global_accel_group_find(Accelerator accelerator); GClosure* global_accel_group_find(Accelerator accelerator);
void command_connect_accelerator(const Accelerator& accelerator, const Callback& callback); void global_accel_group_connect(const Accelerator& accelerator, const Callback& callback);
void command_disconnect_accelerator(const Accelerator& accelerator, const Callback& callback); void global_accel_group_disconnect(const Accelerator& accelerator, const Callback& callback);
class Command class Command

1
plugins/shaders/shaders.cpp
View file

@ -1177,6 +1177,7 @@ public:
{ {
GlobalTexturesCache().release((*i).texture()); GlobalTexturesCache().release((*i).texture());
} }
m_layers.clear();
} }
} }

1
radiant/camwindow.cpp
View file

@ -1930,6 +1930,7 @@ void Camera_registerPreferencesPage()
typedef FreeCaller1<bool, CamWnd_Move_Discrete_Import> CamWndMoveDiscreteImportCaller; typedef FreeCaller1<bool, CamWnd_Move_Discrete_Import> CamWndMoveDiscreteImportCaller;
/// \brief Initialisation for things that have the same lifespan as this module.
void CamWnd_Construct() void CamWnd_Construct()
{ {
GlobalCommands_insert("CenterView", FreeCaller<GlobalCamera_ResetAngles>(), Accelerator(GDK_End)); GlobalCommands_insert("CenterView", FreeCaller<GlobalCamera_ResetAngles>(), Accelerator(GDK_End));

10
radiant/gtkmisc.cpp
View file

@ -54,27 +54,27 @@ void command_connect_accelerator(const char* name)
{ {
const Command& command = GlobalCommands_find(name); const Command& command = GlobalCommands_find(name);
GlobalShortcuts_register(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) void command_disconnect_accelerator(const char* name)
{ {
const Command& command = GlobalCommands_find(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) void toggle_add_accelerator(const char* name)
{ {
const Toggle& toggle = GlobalToggles_find(name); const Toggle& toggle = GlobalToggles_find(name);
GlobalShortcuts_register(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) GtkCheckMenuItem* create_check_menu_item_with_mnemonic(GtkMenu* menu, const char* mnemonic, const char* commandName)
{ {
GlobalShortcuts_register(commandName); GlobalShortcuts_register(commandName);
const Toggle& toggle = GlobalToggles_find(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); 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); GlobalShortcuts_register(commandName);
const Command& command = GlobalCommands_find(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); return create_menu_item_with_mnemonic(menu, mnemonic, command);
} }