[vlc-commits] macosx/CAS: fix incorrect channel name field activation in stream panel

Felix Paul Kühne git at videolan.org
Fri Dec 28 11:15:50 CET 2012


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Dec 27 18:10:42 2012 +0100| [7b6a20bb9cb91fb58cf09854cb5bafa34c7ff97b] | committer: Felix Paul Kühne

macosx/CAS: fix incorrect channel name field activation in stream panel

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b6a20bb9cb91fb58cf09854cb5bafa34c7ff97b
---

 modules/gui/macosx/ConvertAndSave.m |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m
index 00146a3..d41954b 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -496,8 +496,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
         [_stream_rtsp_ckb setEnabled:YES];
         [_stream_http_ckb setEnabled:YES];
         [_stream_sdp_ckb setEnabled:YES];
-        [_stream_channel_fld setEnabled:YES];
-        [_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]];
     } else { // UDP
         [_stream_ttl_fld setEnabled:YES];
         [_stream_ttl_stepper setEnabled:YES];
@@ -505,12 +503,13 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
         [_stream_rtsp_ckb setEnabled:NO];
         [_stream_http_ckb setEnabled:NO];
         [_stream_sdp_ckb setEnabled:NO];
-        [_stream_channel_fld setEnabled:YES];
     }
+    [self streamAnnouncementToggle:sender];
 }
 
 - (IBAction)streamAnnouncementToggle:(id)sender
 {
+    [_stream_channel_fld setEnabled:([_stream_http_ckb state] || [_stream_rtsp_ckb state] || [_stream_sap_ckb state]) && ([_stream_http_ckb isEnabled] || [_stream_rtsp_ckb isEnabled] || [_stream_sap_ckb isEnabled])];
     [_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]];
 }
 



More information about the vlc-commits mailing list