Commit 84866202 authored by David Fuhrmann's avatar David Fuhrmann

macosx: info panel: do not update UI if window is not loaded

parent 581c9952
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
input_item_t *p_item; input_item_t *p_item;
BOOL b_awakeFromNib;
BOOL b_stats; BOOL b_stats;
} }
@end @end
...@@ -106,8 +105,6 @@ ...@@ -106,8 +105,6 @@
[self.window setInitialFirstResponder: _uriLabel]; [self.window setInitialFirstResponder: _uriLabel];
b_awakeFromNib = YES;
b_stats = var_InheritBool(VLCIntf, "stats"); b_stats = var_InheritBool(VLCIntf, "stats");
if (!b_stats) { if (!b_stats) {
if ([_tabView numberOfTabViewItems] > 2) if ([_tabView numberOfTabViewItems] > 2)
...@@ -131,7 +128,7 @@ ...@@ -131,7 +128,7 @@
- (void)updateCocoaWindowLevel:(NSInteger)i_level - (void)updateCocoaWindowLevel:(NSInteger)i_level
{ {
if (self.window && [self.window isVisible] && [self.window level] != i_level) if (self.isWindowLoaded && [self.window isVisible] && [self.window level] != i_level)
[self.window setLevel: i_level]; [self.window setLevel: i_level];
} }
...@@ -185,6 +182,9 @@ ...@@ -185,6 +182,9 @@
p_item = _p_item; p_item = _p_item;
} }
if (!self.isWindowLoaded)
return;
if (!p_item) { if (!p_item) {
/* Erase */ /* Erase */
#define SET( foo ) \ #define SET( foo ) \
...@@ -262,15 +262,17 @@ FREENULL( psz_##foo ); ...@@ -262,15 +262,17 @@ FREENULL( psz_##foo );
- (void)updateStatistics - (void)updateStatistics
{ {
if (!b_awakeFromNib || !b_stats) if (!self.isWindowLoaded || !b_stats)
return; return;
if ([self.window isVisible]) {
if (!p_item || !p_item->p_stats) { if (!p_item || !p_item->p_stats) {
[self initMediaPanelStats]; [self initMediaPanelStats];
return; return;
} }
if (![self.window isVisible])
return;
vlc_mutex_lock(&p_item->p_stats->lock); vlc_mutex_lock(&p_item->p_stats->lock);
/* input */ /* input */
...@@ -301,7 +303,6 @@ FREENULL( psz_##foo ); ...@@ -301,7 +303,6 @@ FREENULL( psz_##foo );
[_lostAudioBuffersTextField setIntValue: p_item->p_stats->i_lost_abuffers]; [_lostAudioBuffersTextField setIntValue: p_item->p_stats->i_lost_abuffers];
vlc_mutex_unlock(&p_item->p_stats->lock); vlc_mutex_unlock(&p_item->p_stats->lock);
}
} }
- (void)updateStreamsList - (void)updateStreamsList
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment