fixed checking on valid key or modifier, bug [ 600811 ]
This commit is contained in:
parent
40825bf4e1
commit
d2aad76c13
1 changed files with 7 additions and 2 deletions
|
@ -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.18 2002/08/11 21:21:06 fluxgen Exp $
|
//$Id: Keys.cc,v 1.19 2002/08/28 20:25:15 fluxgen Exp $
|
||||||
|
|
||||||
|
|
||||||
#include "Keys.hh"
|
#include "Keys.hh"
|
||||||
|
@ -221,8 +221,13 @@ bool Keys::load(const char *filename) {
|
||||||
int tmpmod=getModifier(val[argc].c_str());
|
int tmpmod=getModifier(val[argc].c_str());
|
||||||
if(tmpmod)
|
if(tmpmod)
|
||||||
mod|=tmpmod; //If it's a modifier
|
mod|=tmpmod; //If it's a modifier
|
||||||
else{
|
else {
|
||||||
key = getKey(val[argc].c_str()); // else get the key
|
key = getKey(val[argc].c_str()); // else get the key
|
||||||
|
if (key == 0) {
|
||||||
|
cerr<<"["<<filename<<"]: Invalid key/modifier on line("<<
|
||||||
|
line<<"): "<<linebuffer<<endl;
|
||||||
|
break; // get next line
|
||||||
|
}
|
||||||
if (!current_key) {
|
if (!current_key) {
|
||||||
current_key = new t_key(key, mod);
|
current_key = new t_key(key, mod);
|
||||||
last_key = current_key;
|
last_key = current_key;
|
||||||
|
|
Loading…
Reference in a new issue