Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-19 06:29:10 +03:00
Code Issues Projects Releases Wiki Activity

Fixed the problem that caused the software to crash in MergeDialog on select the action

Browse Source
This commit is contained in:
Maickonn Richard 2019-06-01 21:06:45 -03:00
parent fc90ffd3c5
commit faa6f85514
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dialogs/MergeDialog.cpp
View File

@ -55,14 +55,11 @@ MergeDialog::MergeDialog(
QLabel *label = new QLabel(labelText(), this);
QCheckBox *noCommit = nullptr;
if (flags & RepoView::Merge) {
noCommit = new QCheckBox(tr("No commit"), this);
noCommit->setChecked(!Settings::instance()->value(kCommitKey).toBool());
connect(noCommit, &QCheckBox::toggled, [](bool checked) {
Settings::instance()->setValue(kCommitKey, !checked);
});
}
QCheckBox *noCommit = new QCheckBox(tr("No commit"), this);
noCommit->setChecked(!Settings::instance()->value(kCommitKey).toBool());
connect(noCommit, &QCheckBox::toggled, [](bool checked) {
Settings::instance()->setValue(kCommitKey, !checked);
});
auto signal = QOverload<int>::of(&QComboBox::currentIndexChanged);
connect(mAction, signal, [this, label, noCommit]() {