diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /src/gui/charselectdialog.cpp | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'src/gui/charselectdialog.cpp')
| -rw-r--r-- | src/gui/charselectdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 638691bab..d2b74a632 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -386,7 +386,7 @@ bool CharSelectDialog::selectByName(const std::string &name, Net::Character *character = mCharacterEntries[i]->getCharacter(); if (mCharacterEntries[i] && character) { - if (character->dummy->getName() == name) + if ( character->dummy && character->dummy->getName() == name) { if (mCharacterEntries[i]) mCharacterEntries[i]->requestFocus(); |