Fixed assertion on exit when keeping preferences open · mapeditor/tiled@d454e3d (original) (raw)

`@@ -74,19 +74,23 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)

`

74

74

``

75

75

`auto *preferences = Preferences::instance();

`

76

76

``

``

77

`+

connect(mUi->enableDtd, &QCheckBox::toggled,

`

``

78

`+

preferences, &Preferences::setDtdEnabled);

`

``

79

`+

connect(mUi->reloadTilesetImages, &QCheckBox::toggled,

`

``

80

`+

preferences, &Preferences::setReloadTilesetsOnChanged);

`

``

81

`+

connect(mUi->openLastFiles, &QCheckBox::toggled,

`

``

82

`+

preferences, &Preferences::setOpenLastFilesOnStartup);

`

``

83

+

77

84

`connect(mUi->languageCombo, SIGNAL(currentIndexChanged(int)),

`

78

85

`SLOT(languageSelected(int)));

`

79

``

`-

connect(mUi->openGL, &QCheckBox::toggled,

`

80

``

`-

preferences, &Preferences::setUseOpenGL);

`

81

86

`connect(mUi->gridColor, SIGNAL(colorChanged(QColor)),

`

82

87

` preferences, SLOT(setGridColor(QColor)));

`

83

88

`connect(mUi->gridFine, SIGNAL(valueChanged(int)),

`

84

89

` preferences, SLOT(setGridFine(int)));

`

85

90

`connect(mUi->objectLineWidth, SIGNAL(valueChanged(double)),

`

86

91

` preferences, SLOT(setObjectLineWidth(qreal)));

`

87

``

-

88

``

`-

connect(mUi->openLastFiles, &QCheckBox::toggled,

`

89

``

`-

preferences, &Preferences::setOpenLastFilesOnStartup);

`

``

92

`+

connect(mUi->openGL, &QCheckBox::toggled,

`

``

93

`+

preferences, &Preferences::setUseOpenGL);

`

90

94

``

91

95

`connect(mUi->autoUpdateCheckBox, &QPushButton::toggled,

`

92

96

`this, &PreferencesDialog::autoUpdateToggled);

`

`@@ -99,7 +103,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)

`

99

103

``

100

104

`PreferencesDialog::~PreferencesDialog()

`

101

105

`{

`

102

``

`-

toPreferences();

`

103

106

`delete mUi;

`

104

107

`}

`

105

108

``

`@@ -155,15 +158,6 @@ void PreferencesDialog::fromPreferences()

`

155

158

` }

`

156

159

`}

`

157

160

``

158

``

`-

void PreferencesDialog::toPreferences()

`

159

``

`-

{

`

160

``

`-

Preferences *prefs = Preferences::instance();

`

161

``

-

162

``

`-

prefs->setReloadTilesetsOnChanged(mUi->reloadTilesetImages->isChecked());

`

163

``

`-

prefs->setDtdEnabled(mUi->enableDtd->isChecked());

`

164

``

`-

prefs->setOpenLastFilesOnStartup(mUi->openLastFiles->isChecked());

`

165

``

`-

}

`

166

``

-

167

161

`void PreferencesDialog::retranslateUi()

`

168

162

`{

`

169

163

`mUi->languageCombo->setItemText(0, tr("System default"));

`