79ebf545aa
- Drop Fix-utm-enum-value.patch - Add Add-fallback-InputHandler.patch from upstream instead to fix the crash (boo#1044747, kde#381872) OBS-URL: https://build.opensuse.org/request/show/508484 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=138
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From c2daba4216d83b90599d4fbb405e1a6ba633c9a8 Mon Sep 17 00:00:00 2001
|
|
From: Mohammed Nafees <nafees.technocool@gmail.com>
|
|
Date: Thu, 6 Jul 2017 14:13:44 +0530
|
|
Subject: Add fallback InputHandler to prevent crash when adding bookmark with
|
|
UTM view angle
|
|
|
|
BUG: 381872
|
|
---
|
|
src/lib/marble/LatLonEdit.cpp | 20 +++++++++++---------
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/lib/marble/LatLonEdit.cpp b/src/lib/marble/LatLonEdit.cpp
|
|
index 0d64c59..c000cb6 100644
|
|
--- a/src/lib/marble/LatLonEdit.cpp
|
|
+++ b/src/lib/marble/LatLonEdit.cpp
|
|
@@ -562,21 +562,23 @@ void LatLonEdit::setNotation(GeoDataCoordinates::Notation notation)
|
|
d->m_inputHandler = new DMInputHandler(d);
|
|
break;
|
|
case GeoDataCoordinates::UTM:
|
|
- /** @todo implement */
|
|
+ /** @todo see below */
|
|
break;
|
|
case GeoDataCoordinates::Astro:
|
|
- /** @todo implement */
|
|
+ /** @todo see below */
|
|
break;
|
|
}
|
|
|
|
- if (d->m_inputHandler) {
|
|
- d->m_notation = notation;
|
|
- d->m_inputHandler->setupUi();
|
|
- d->m_inputHandler->setupMinMax(d->m_dimension);
|
|
- d->m_inputHandler->setValue(d->m_value);
|
|
- } else {
|
|
- Q_ASSERT(false && "Support for this notation has not been implemented yet");
|
|
+ if (!d->m_inputHandler) {
|
|
+ /** @todo Temporary fallback to DecimalInputHandler
|
|
+ * Implement proper handlers for UTM and Astro */
|
|
+ d->m_inputHandler = new DecimalInputHandler(d);
|
|
}
|
|
+
|
|
+ d->m_notation = notation;
|
|
+ d->m_inputHandler->setupUi();
|
|
+ d->m_inputHandler->setupMinMax(d->m_dimension);
|
|
+ d->m_inputHandler->setValue(d->m_value);
|
|
}
|
|
|
|
void LatLonEdit::checkFloatValueOverflow()
|
|
--
|
|
cgit v0.11.2
|
|
|