Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
50329a43
Commit
50329a43
authored
Jul 27, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed race conditional crashes in PXSourceList (close #7171)
Trust the ObjC runtime, it will do its job properly.
parent
731de0e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
modules/gui/macosx/PXSourceList.m
modules/gui/macosx/PXSourceList.m
+4
-10
No files found.
modules/gui/macosx/PXSourceList.m
View file @
50329a43
...
@@ -71,10 +71,6 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
...
@@ -71,10 +71,6 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
-
(
void
)
dealloc
-
(
void
)
dealloc
{
{
//Remove ourselves as the delegate and data source to be safe
[
super
setDataSource
:
nil
];
[
super
setDelegate
:
nil
];
//Unregister the delegate from receiving notifications
//Unregister the delegate from receiving notifications
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
_secondaryDelegate
name
:
nil
object
:
self
];
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
_secondaryDelegate
name
:
nil
object
:
self
];
...
@@ -83,10 +79,6 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
...
@@ -83,10 +79,6 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
-
(
void
)
finalize
-
(
void
)
finalize
{
{
//Remove ourselves as the delegate and data source to be safe
[
super
setDataSource
:
nil
];
[
super
setDelegate
:
nil
];
//Unregister the delegate from receiving notifications
//Unregister the delegate from receiving notifications
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
_secondaryDelegate
name
:
nil
object
:
self
];
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
_secondaryDelegate
name
:
nil
object
:
self
];
...
@@ -117,7 +109,8 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
...
@@ -117,7 +109,8 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
{
{
_secondaryDataSource
=
aDataSource
;
_secondaryDataSource
=
aDataSource
;
[
self
reloadData
];
if
([
self
respondsToSelector
:
@selector
(
reloadData
)])
[
self
reloadData
];
}
}
-
(
void
)
setIconSize
:(
NSSize
)
newIconSize
-
(
void
)
setIconSize
:(
NSSize
)
newIconSize
...
@@ -138,7 +131,8 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
...
@@ -138,7 +131,8 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification = @"PXSourceListDeleteKe
-
(
void
)
reloadData
-
(
void
)
reloadData
{
{
[
super
reloadData
];
if
([
super
respondsToSelector
:
@selector
(
reloadData
)])
[
super
reloadData
];
//Expand items that are displayed as always expanded
//Expand items that are displayed as always expanded
if
([
_secondaryDataSource
conformsToProtocol
:
@protocol
(
PXSourceListDataSource
)]
&&
if
([
_secondaryDataSource
conformsToProtocol
:
@protocol
(
PXSourceListDataSource
)]
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment