settings: greatly simplify OnSettingChanging() handler for videoscreen.screen/resolut...

[vuplus_xbmc] / xbmc / settings / DisplaySettings.h

diff --git a/xbmc/settings/DisplaySettings.h b/xbmc/settings/DisplaySettings.h
index af03656..446e6a0 100644 (file)
--- a/xbmc/settings/DisplaySettings.h
+++ b/xbmc/settings/DisplaySettings.h
@@ -121,13 +121,6 @@ private:
   float m_verticalShift;      // current vertical shift
   bool  m_nonLinearStretched;   // current non-linear stretch
 
-  /*!
-   \brief A set of pairs consisting of a setting identifier
-   and a boolean value which should be ignored in specific
-   situations. If the boolean value is "true" the whole
-   OnSettingChanging() logic must be skipped once. If it
-   is "false" only showing the GUI dialog must be skipped.
-   */
-  std::set< std::pair<std::string, bool> > m_ignoreSettingChanging;
+  bool m_resolutionChangeAborted;
   CCriticalSection m_critical;
 };