rendered paste bodyIndex: libs/libmythtv/osdtypes.cpp
===================================================================
--- libs/libmythtv/osdtypes.cpp (revision 9452)
+++ libs/libmythtv/osdtypes.cpp (working copy)
@@ -375,16 +375,17 @@
if (m_fadetime <= 0)
{
m_fadetime = 0;
- if (currentOSDFunctionalType)
- {
- emit OSDClosed(currentOSDFunctionalType);
- currentOSDFunctionalType = 0;
- }
}
}
- if (m_timeleft <= 0 && m_fadetime <= 0)
+ if (m_timeleft <= 0 && m_fadetime <= 0) {
+ if (currentOSDFunctionalType)
+ {
+ emit OSDClosed(currentOSDFunctionalType);
+ currentOSDFunctionalType = 0;
+ }
m_displaying = false;
+ }
}
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~