vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Oct 29 
23:54:46 2017 +0100| [20b7ba1e8dcf904bbff3c643a953e191ebe90154] | committer: 
David Fuhrmann

macosx: Fix crashes when using TextfieldPanel or PopupPanel

Those strings - like any other pointer type - should not be
assigned, but always retained. Otherwise already released objects
are used subsequently.

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

 modules/gui/macosx/VLCPopupPanelController.h     | 10 +++++-----
 modules/gui/macosx/VLCTextfieldPanelController.h |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/gui/macosx/VLCPopupPanelController.h 
b/modules/gui/macosx/VLCPopupPanelController.h
index cc631f39f1..a4c4c48169 100644
--- a/modules/gui/macosx/VLCPopupPanelController.h
+++ b/modules/gui/macosx/VLCPopupPanelController.h
@@ -31,11 +31,11 @@
 @property (weak) IBOutlet NSButton *cancelButton;
 @property (weak) IBOutlet NSButton *okButton;
 
-@property (readwrite, assign) NSString *titleString;
-@property (readwrite, assign) NSString *subTitleString;
-@property (readwrite, assign) NSString *okButtonString;
-@property (readwrite, assign) NSString *cancelButtonString;
-@property (readwrite, assign) NSArray *popupButtonContent;
+@property (readwrite) NSString *titleString;
+@property (readwrite) NSString *subTitleString;
+@property (readwrite) NSString *okButtonString;
+@property (readwrite) NSString *cancelButtonString;
+@property (readwrite) NSArray *popupButtonContent;
 
 /**
  * Completion handler for popup panel
diff --git a/modules/gui/macosx/VLCTextfieldPanelController.h 
b/modules/gui/macosx/VLCTextfieldPanelController.h
index f21d5e3382..9175439442 100644
--- a/modules/gui/macosx/VLCTextfieldPanelController.h
+++ b/modules/gui/macosx/VLCTextfieldPanelController.h
@@ -31,10 +31,10 @@
 @property (weak) IBOutlet NSButton *cancelButton;
 @property (weak) IBOutlet NSButton *okButton;
 
-@property (readwrite, assign) NSString *titleString;
-@property (readwrite, assign) NSString *subTitleString;
-@property (readwrite, assign) NSString *okButtonString;
-@property (readwrite, assign) NSString *cancelButtonString;
+@property (readwrite) NSString *titleString;
+@property (readwrite) NSString *subTitleString;
+@property (readwrite) NSString *okButtonString;
+@property (readwrite) NSString *cancelButtonString;
 
 /**
  * Completion handler for textfield panel

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to