Fixes some bugs due to parsing of menu items with shortcuts.

docs/RELEASES

@@ -1,3 +1,11 @@
+0.9.4.2 - Fixed crash when map was left in invalid state after failed
+          load.
+
+          Fixed bug where pilot and system names were not properly being
+          passed to some functions due to menu shortcuts.  Oddly, this
+          didn't show itself when using Qt with Unity, but it does with
+          KDE (and presumably Windows).
+
 0.9.4.1 - Fixed bug where #defines were not working with newest qt/gcc.
           (thanks Hibasnev!)
 
@@ -345,6 +353,7 @@
 
 Coming soon:
 
+- fix heimatar loading &Heimatar
 - kos msg for red by last should show person and corp.
 - fix display of messages with backslashes.
 - better pilot cache/cleanup.
@@ -353,8 +362,7 @@ Coming soon:
 - TTS support
 - Maybe an option to auto-change region?
 - Poll/repoll pilots option?
-- WH icon for system (xxx-xx contains/has a wh|wormhole|hole)
-- Clear wh:  (xxx-xx wh closed|collapsed|gone)
+- Bubble icons?
 - Make mini militia faction count (RBL npc corps)?
 - Add some intelligence to handle dumb names like R3 Clear
 - Add option to autobuild jumpbridge list from dotlan instead of files.

src/imp.pro

@@ -12,7 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = imp
 TEMPLATE = app
 
-VERSION = 0.9.4.1
+VERSION = 0.9.4.2
 QMAKE_TARGET_COMPANY = EternalDusk
 QMAKE_TARGET_DESCRIPTION = Eve Online Intelligence Management Program
 QMAKE_TARGET_COPYRIGHT = (c) Copyright 2016-2017 Jesse Litton

src/mainwindow.cpp

@@ -1627,7 +1627,7 @@ void MainWindow::mapSelected()
     QAction *s = qobject_cast<QAction *> (sender());
     qDebug() << "MainWindow::mapSelected - for " << s->text();
 
-    switchToRegion(s->text());
+    switchToRegion(withoutShortcutAmpersands(s->text()));
 }
 
 void MainWindow::gotNewPilot(const QString& pilotName)
@@ -1672,19 +1672,20 @@ void MainWindow::pilotSelected()
 {
     QAction *s = qobject_cast<QAction *> (sender());
 
-    qDebug() << "MainWindow::pilotSelected - for " << s->text();
+    QString pilotName = withoutShortcutAmpersands(s->text());
+    qDebug() << "MainWindow::pilotSelected - for " << pilotName;
 
     if(s->isChecked())
     {
         // Add pilot back to map
-        ui->mapView->enablePilot(s->text());
-        options.enablePilot(s->text());
+        ui->mapView->enablePilot(pilotName);
+        options.enablePilot(pilotName);
     }
     else
     {
         // Remove pilot from map
-        ui->mapView->disablePilot(s->text());
-        options.disablePilot(s->text());
+        ui->mapView->disablePilot(pilotName);
+        options.disablePilot(pilotName);
     }
 }
 

src/map.cpp

@@ -302,7 +302,7 @@ QString Map::getSystemByAbbreviation(const QString& word)
 
     QString upperWord = word.toUpper();
 
-    if(m_systemMap.keys().contains(upperWord))
+    if(m_systemMap.contains(upperWord))
     {
         // Not abbreviated at all.
         return upperWord;

src/meta.h

@@ -27,8 +27,8 @@ static const struct Version
 {
     Version(){}
 
-    QString release = "0.9.4.1"; //VERSION;
-    QString name = "Pigs are People";
+    QString release = "0.9.4.2"; //VERSION;
+    QString name = "Pandemic Lesion";
 
     QString styleHeader1 = "<span style=\" color:#0000ff;\">";
     QString styleFooter1 = "</span>";