Skip to content

Commit

Permalink
invert the gba selection so false=gba
Browse files Browse the repository at this point in the history
  • Loading branch information
Dabomstew committed Jan 17, 2017
1 parent 077e04f commit 165ded0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions gambatte_qt/src/gambattemenuhandler.cpp
Expand Up @@ -289,7 +289,7 @@ GambatteMenuHandler::GambatteMenuHandler(MainWindow &mw,
, recentFileActs_()
, pauseAction_()
, syncFrameRateAction_()
, gbaCgbAction_()
, cgbRngAction_()
#ifdef DMG_SUPPORT
, dmgModeAction_()
#endif
Expand Down Expand Up @@ -404,9 +404,9 @@ GambatteMenuHandler::GambatteMenuHandler(MainWindow &mw,
settingsm->addSeparator();
settingsm->addMenu(windowSizeMenu_.menu());
settingsm->addSeparator();
gbaCgbAction_ = settingsm->addAction(tr("GB&A CGB Mode"));
gbaCgbAction_->setCheckable(true);
gbaCgbAction_->setChecked(QSettings().value("gbacgb-sr", true).toBool());
cgbRngAction_ = settingsm->addAction(tr("Origin&al GBC RNG"));
cgbRngAction_->setCheckable(true);
cgbRngAction_->setChecked(QSettings().value("gbcrng-sr", false).toBool());

settingsm->addAction(tr("Select GBC Bios Image..."), this, SLOT(openGBCBios()));

Expand Down Expand Up @@ -501,7 +501,7 @@ GambatteMenuHandler::GambatteMenuHandler(MainWindow &mw,

GambatteMenuHandler::~GambatteMenuHandler() {
QSettings settings;
settings.setValue("gbacgb-sr", gbaCgbAction_->isChecked());
settings.setValue("gbcrng-sr", cgbRngAction_->isChecked());
#ifdef DMG_SUPPORT
settings.setValue("dmgmode-sr", dmgModeAction_->isChecked());
#endif
Expand Down Expand Up @@ -586,7 +586,7 @@ void GambatteMenuHandler::loadFile(QString const &fileName) {

if (gambatte::LoadRes const error =
source_.load(fileName.toLocal8Bit().constData(),
gbaCgbAction_->isChecked() * gambatte::GB::GBA_CGB
!(cgbRngAction_->isChecked()) * gambatte::GB::GBA_CGB
+ dmgMode * gambatte::GB::FORCE_DMG
+ miscDialog_->multicartCompat() * gambatte::GB::MULTICART_COMPAT)) {
mw_.stop();
Expand Down
2 changes: 1 addition & 1 deletion gambatte_qt/src/gambattemenuhandler.h
Expand Up @@ -139,7 +139,7 @@ class GambatteMenuHandler : public QObject {
QAction *recentFileActs_[max_recent_files];
QAction *pauseAction_;
QAction *syncFrameRateAction_;
QAction *gbaCgbAction_;
QAction *cgbRngAction_;
#ifdef DMG_SUPPORT
QAction *dmgModeAction_;
#endif
Expand Down

0 comments on commit 165ded0

Please sign in to comment.