Skip to content

Commit 7cb246d

Browse files
committed
verify default_lflist after loading
1 parent 1d5038b commit 7cb246d

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

gframe/deck_con.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,7 @@ void DeckBuilder::Initialize() {
8080
mainGame->btnSideSort->setVisible(false);
8181
mainGame->btnSideReload->setVisible(false);
8282
if (mainGame->gameConf.use_lflist) {
83-
if (mainGame->gameConf.default_lflist >= 0 && mainGame->gameConf.default_lflist < (int)deckManager._lfList.size()) {
84-
filterList = &deckManager._lfList[mainGame->gameConf.default_lflist];
85-
}
86-
else {
87-
mainGame->gameConf.default_lflist = 0;
88-
filterList = &deckManager._lfList.front();
89-
}
83+
filterList = &deckManager._lfList[mainGame->gameConf.default_lflist];
9084
}
9185
else {
9286
filterList = &deckManager._lfList.back();

gframe/game.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ bool Game::Initialize() {
101101
device->getLogger()->setLogLevel(irr::ELOG_LEVEL::ELL_ERROR);
102102
#endif
103103
deckManager.LoadLFList();
104+
if(gameConf.default_lflist >= (int)deckManager._lfList.size() || gameConf.default_lflist < 0)
105+
gameConf.default_lflist = 0;
104106
driver = device->getVideoDriver();
105107
driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false);
106108
driver->setTextureCreationFlag(irr::video::ETCF_OPTIMIZED_FOR_QUALITY, true);

0 commit comments

Comments
 (0)