[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/vcs/widgets
From:       Lorenzo Villani <lvillani () binaryhelix ! net>
Date:       2009-03-26 13:09:13
Message-ID: 1238072953.243665.9498.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 944900 by villani:

fix a possible crash with DVCS

 M  +7 -2      vcscommitdialog.cpp  


--- trunk/KDE/kdevplatform/vcs/widgets/vcscommitdialog.cpp #944899:944900
@@ -167,7 +167,7 @@
                     d->insertRow( i18nc("version controlled file was modified", \
"Modified"), path );  break;
                 case VcsStatusInfo::ItemUnknown:
-                    d->insertRow( i18nc("file is not known to versioncontrolsystem", \
"Unknown"),  +                    d->insertRow( i18nc("file is not known to \
versioncontrolsystem", "Unknown"),  path, newGreen, Qt::Unchecked );
                     break;
                 //DVCS part
@@ -231,7 +231,12 @@
         if (!resetFiles.isEmpty())
         {
             repo = resetFiles[0];
-            idvcs->reset(repo, QStringList(QString("--")), resetFiles)->exec();
+            KJob* j = idvcs->reset(repo, QStringList(QString("--")), resetFiles);
+            if (!j) {
+                KMessageBox::error(ICore::self()->uiController()->activeMainWindow(), \
i18n("Could not reset files. %1 returned no job to execute.", idvcs->name())); +      \
} else { +                j->exec();
+            }
         }
         if (!addFiles.isEmpty())
         {


[prev in list] [next in list] [prev in thread] [next in thread]