summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-28 20:25:15 (GMT)
committerfluxgen <fluxgen>2002-08-28 20:25:15 (GMT)
commitd2aad76c13694bd417e74bfee064cfdc8875f9a2 (patch)
tree279412068db4a4667fefb0dc503fa46458ce1a56
parent40825bf4e105bd3fba43e3061bb63a28e702ca68 (diff)
downloadfluxbox_lack-d2aad76c13694bd417e74bfee064cfdc8875f9a2.zip
fluxbox_lack-d2aad76c13694bd417e74bfee064cfdc8875f9a2.tar.bz2
fixed checking on valid key or modifier, bug [ 600811 ]
-rw-r--r--src/Keys.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index 3dfc37f..84953d9 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Keys.cc,v 1.18 2002/08/11 21:21:06 fluxgen Exp $ 22//$Id: Keys.cc,v 1.19 2002/08/28 20:25:15 fluxgen Exp $
23 23
24 24
25#include "Keys.hh" 25#include "Keys.hh"
@@ -221,8 +221,13 @@ bool Keys::load(const char *filename) {
221 int tmpmod=getModifier(val[argc].c_str()); 221 int tmpmod=getModifier(val[argc].c_str());
222 if(tmpmod) 222 if(tmpmod)
223 mod|=tmpmod; //If it's a modifier 223 mod|=tmpmod; //If it's a modifier
224 else{ 224 else {
225 key = getKey(val[argc].c_str()); // else get the key 225 key = getKey(val[argc].c_str()); // else get the key
226 if (key == 0) {
227 cerr<<"["<<filename<<"]: Invalid key/modifier on line("<<
228 line<<"): "<<linebuffer<<endl;
229 break; // get next line
230 }
226 if (!current_key) { 231 if (!current_key) {
227 current_key = new t_key(key, mod); 232 current_key = new t_key(key, mod);
228 last_key = current_key; 233 last_key = current_key;