nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed memorybug and typeo

Browse source
This commit is contained in:
fluxgen 2002-01-08 21:45:49 +00:00
parent 11ae668af7
commit fad5148752
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Keys.cc
View file

@ -1,4 +1,4 @@
// Key2.cc for Fluxbox - an X11 Window manager // Keys.cc for Fluxbox - an X11 Window manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
//$Id: Keys.cc,v 1.5 2002/01/08 12:13:25 fluxgen Exp $ //$Id: Keys.cc,v 1.6 2002/01/08 21:45:49 fluxgen Exp $
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
@ -133,9 +133,9 @@ m_display(display)
load(filename); load(filename);
} }
Keys::~Keys() { Keys::~Keys() {
deleteTree();
ungrabKeys(); ungrabKeys();
deleteTree();
} }
//--------- deleteTree ----------- //--------- deleteTree -----------
@ -174,7 +174,9 @@ bool Keys::load(char *filename) {
//ungrab all keys //ungrab all keys
ungrabKeys(); ungrabKeys();
//free memory of previous grabs
deleteTree();
XSync(m_display, False); XSync(m_display, False);
//open the file //open the file
@ -272,7 +274,7 @@ bool Keys::load(char *filename) {
//add the keychain to list //add the keychain to list
if (!mergeTree(current_key)) if (!mergeTree(current_key))
cerr<<"Keys: Faild to merge keytree!"<<endl; cerr<<"Keys: Failed to merge keytree!"<<endl;
#ifdef DEBUG #ifdef DEBUG
if (m_actionlist[i].action == Keys::EXECUTE) { if (m_actionlist[i].action == Keys::EXECUTE) {