diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-31 17:29:39 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-12-31 17:29:39 -0300 |
commit | 6f102d1647580e0bb9513c124b26a64c77da4f15 (patch) | |
tree | 0340f1f588be251183fe2b251bdba778f2c85c22 /libre/kdelibs-libre/fix-crash-on-open-with.patch | |
parent | 433900b14f11dc9ee55b72e8e5946bf47f65b636 (diff) | |
parent | b6cb10de275cea63bab0bee2a98342afa4fdc4ee (diff) | |
download | abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.tar.gz abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.tar.bz2 abslibre-6f102d1647580e0bb9513c124b26a64c77da4f15.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/kdelibs-libre/fix-crash-on-open-with.patch')
-rw-r--r-- | libre/kdelibs-libre/fix-crash-on-open-with.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libre/kdelibs-libre/fix-crash-on-open-with.patch b/libre/kdelibs-libre/fix-crash-on-open-with.patch new file mode 100644 index 000000000..60556386d --- /dev/null +++ b/libre/kdelibs-libre/fix-crash-on-open-with.patch @@ -0,0 +1,19 @@ +commit 0820b3173aff4f0f3c803a9e75e726024da38ee5 +Author: David Faure <faure@kde.org> +Date: Thu Dec 6 11:55:05 2012 +0100 + + Fix crash when no service was selected (user clicked on "Open With...") + +diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp +index 6d84800..6de0380 100644 +--- a/kparts/browserrun.cpp ++++ b/kparts/browserrun.cpp +@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _ + this, SLOT(slotCopyToTempFileResult(KJob*)) ); + return Delayed; // We'll continue after the job has finished + } +- if (selectedService) { ++ if (selectedService && question.selectedService()) { + *selectedService = question.selectedService(); + // KRun will use this when starting an app + KRun::setPreferredService(question.selectedService()->desktopEntryName()); |