diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-05-06 19:43:37 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-05-07 11:00:40 +0200 |
| commit | 002fa92a34be41bdaf0ded1d74444b41c6d2dec6 (patch) | |
| tree | 8026eb83a2e71b19d3e46add0b387290e5a5bf48 /src/plugins/git/gerrit/gerritplugin.cpp | |
| parent | 20625d549834c33118b64872b1ab2230fbcfd40f (diff) | |
| download | qt-creator-002fa92a34be41bdaf0ded1d74444b41c6d2dec6.tar.gz | |
Git: Fix validation in GerritPushDialog
Change-Id: I1764ccd4950d5d5fee3cbd00515716ef5f524bf0
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gerrit/gerritplugin.cpp')
| -rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 249c1e39d6..80f5f56d14 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -366,11 +366,17 @@ void GerritPlugin::push() QPointer<GerritPushDialog> dialog = new GerritPushDialog(topLevel, Core::ICore::mainWindow()); if (!dialog->localChangesFound()) { - QMessageBox::critical(Core::ICore::mainWindow(), tr("No Local Changes"), + QMessageBox::warning(Core::ICore::mainWindow(), tr("No Local Changes"), tr("Change from HEAD appears to be in remote branch already. Aborting.")); return; } + if (!dialog->valid()) { + QMessageBox::warning(Core::ICore::mainWindow(), tr("Initialization Failed"), + tr("Failed to initialize dialog. Aborting.")); + return; + } + if (dialog->exec() == QDialog::Rejected) return; |