ou1cimx1#23970507: MapsDemo Application crashes if closed

5 files changed, 18 insertions, 4 deletions

diff --git a/src/systeminfo/symbian/chargingstatus_s60.cpp b/src/systeminfo/symbian/chargingstatus_s60.cpp
index fa1e8dc046..08b5dd84ab 100644
--- a/src/systeminfo/symbian/chargingstatus_s60.cpp
+++ b/src/systeminfo/symbian/chargingstatus_s60.cpp
@@ -85,15 +85,17 @@ void CChargingStatus::RunL()
     int status = EChargingStatusError;
     m_chargingProperty.Get(status);
     m_currentStatus = (EPSHWRMChargingStatus)status;
-    
+
     foreach (MChargingStatusObserver *observer, m_observers)
         observer->chargingStatusChanged();
-    
+
     startMonitoring();
 }
 
 void CChargingStatus::startMonitoring()
 {
+	if (!IsActive()) {
     m_chargingProperty.Subscribe(iStatus);
     SetActive();
+  }
 }
diff --git a/src/systeminfo/symbian/lockandflipstatus_s60.cpp b/src/systeminfo/symbian/lockandflipstatus_s60.cpp
index 78dcd72ca9..49af8cf0ce 100644
--- a/src/systeminfo/symbian/lockandflipstatus_s60.cpp
+++ b/src/systeminfo/symbian/lockandflipstatus_s60.cpp
@@ -189,8 +189,10 @@ void CFlipStatus::RunL()
 
 void CFlipStatus::startMonitoring()
 {
+  if (!IsActive()) {
     m_FlipProperty.Subscribe(iStatus);
     SetActive();
+    }
 }
 
 bool CFlipStatus::getFlipStatus()
diff --git a/src/systeminfo/symbian/pubandsubkey_s60.cpp b/src/systeminfo/symbian/pubandsubkey_s60.cpp
index e494889c37..5a3a7d5f1a 100644
--- a/src/systeminfo/symbian/pubandsubkey_s60.cpp
+++ b/src/systeminfo/symbian/pubandsubkey_s60.cpp
@@ -84,6 +84,8 @@ TInt CPubSubKeyHandler::GetValue() const
 
 void CPubSubKeyHandler::StartMonitoring()
     {
-    iProperty.Subscribe(iStatus);
-    SetActive();
+      if (!IsActive()) {
+      iProperty.Subscribe(iStatus);
+      SetActive();
+      }
     }
diff --git a/src/systeminfo/symbian/storagestatus_s60.cpp b/src/systeminfo/symbian/storagestatus_s60.cpp
index 0546b80787..96526fc4e5 100644
--- a/src/systeminfo/symbian/storagestatus_s60.cpp
+++ b/src/systeminfo/symbian/storagestatus_s60.cpp
@@ -183,6 +183,8 @@ void CMMCStorageStatus::RunL()
 
 void CMMCStorageStatus::startMonitoring()
 {
+  if (!IsActive()) {
     iFs.NotifyChange(ENotifyDisk, iStatus);
     SetActive();
+  }
 }
diff --git a/src/systeminfo/symbian/telephonyinfo_s60.cpp b/src/systeminfo/symbian/telephonyinfo_s60.cpp
index 0730ddff47..afb6b9a8f4 100644
--- a/src/systeminfo/symbian/telephonyinfo_s60.cpp
+++ b/src/systeminfo/symbian/telephonyinfo_s60.cpp
@@ -414,8 +414,10 @@ CTelephony::TNetworkMode CCellNetworkInfo::networkMode() const
 void CCellNetworkInfo::startMonitoring()
 {
  TRACES (qDebug() << "CCellNetworkInfo::startMonitoring<---");
+ if (!IsActive()) {
     m_telephony.NotifyChange(iStatus, CTelephony::ECurrentNetworkInfoChange, m_networkInfoV1Pckg);
     SetActive();
+  }
  TRACES (qDebug() << "CCellNetworkInfo::startMonitoring--->");
 }
 
@@ -480,8 +482,10 @@ CTelephony::TRegistrationStatus CCellNetworkRegistrationInfo::cellNetworkStatus(
 void CCellNetworkRegistrationInfo::startMonitoring()
 {
  TRACES (qDebug() << "CCellNetworkRegistrationInfo::startMonitoring<---");
+ if (!IsActive()) {
     m_telephony.NotifyChange(iStatus, CTelephony::ENetworkRegistrationStatusChange, m_networkRegistrationV1Pckg);
     SetActive();
+  }
 TRACES (qDebug() << "CCellNetworkRegistrationInfo::startMonitoring--->");
 }
 
@@ -550,7 +554,9 @@ int CCellSignalStrengthInfo::cellNetworkSignalStrength() const
 void CCellSignalStrengthInfo::startMonitoring()
 {
  TRACES (qDebug() << "CCellSignalStrengthInfo::startMonitoring<---");
+ if (!IsActive()) {
     m_telephony.NotifyChange(iStatus, CTelephony::ESignalStrengthChange, m_signalStrengthV1Pckg);
     SetActive();
+  }
  TRACES (qDebug() << "CCellSignalStrengthInfo::startMonitoring--->");
 }