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
a251a03c
Commit
a251a03c
authored
Aug 14, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Fix toolbar usage in simple_prefs, and fix a double release on toolbar.
Fix a crash when exiting with simple pref open.
parent
bc169be4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
modules/gui/macosx/simple_prefs.h
modules/gui/macosx/simple_prefs.h
+0
-1
modules/gui/macosx/simple_prefs.m
modules/gui/macosx/simple_prefs.m
+3
-4
No files found.
modules/gui/macosx/simple_prefs.h
View file @
a251a03c
...
@@ -150,7 +150,6 @@
...
@@ -150,7 +150,6 @@
BOOL
b_hotkeyChanged
;
BOOL
b_hotkeyChanged
;
id
o_currentlyShownCategoryView
;
id
o_currentlyShownCategoryView
;
NSToolbar
*
o_sprefs_toolbar
;
NSOpenPanel
*
o_selectFolderPanel
;
NSOpenPanel
*
o_selectFolderPanel
;
NSArray
*
o_hotkeyDescriptions
;
NSArray
*
o_hotkeyDescriptions
;
NSArray
*
o_hotkeysNonUseableKeys
;
NSArray
*
o_hotkeysNonUseableKeys
;
...
...
modules/gui/macosx/simple_prefs.m
View file @
a251a03c
...
@@ -59,7 +59,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
...
@@ -59,7 +59,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
-
(
void
)
dealloc
-
(
void
)
dealloc
{
{
[
o_currentlyShownCategoryView
release
];
[
o_currentlyShownCategoryView
release
];
[
o_sprefs_toolbar
release
];
[
o_hotkeySettings
release
];
[
o_hotkeySettings
release
];
[
o_hotkeyDescriptions
release
];
[
o_hotkeyDescriptions
release
];
...
@@ -96,7 +95,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
...
@@ -96,7 +95,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[
self
initStrings
];
[
self
initStrings
];
/* setup the toolbar */
/* setup the toolbar */
o_sprefs_toolbar
=
[[[
NSToolbar
alloc
]
initWithIdentifier
:
VLCSPrefsToolbarIdentifier
]
autorelease
];
NSToolbar
*
o_sprefs_toolbar
=
[[[
NSToolbar
alloc
]
initWithIdentifier
:
VLCSPrefsToolbarIdentifier
]
autorelease
];
[
o_sprefs_toolbar
setAllowsUserCustomization
:
NO
];
[
o_sprefs_toolbar
setAllowsUserCustomization
:
NO
];
[
o_sprefs_toolbar
setAutosavesConfiguration
:
NO
];
[
o_sprefs_toolbar
setAutosavesConfiguration
:
NO
];
[
o_sprefs_toolbar
setDisplayMode
:
NSToolbarDisplayModeIconAndLabel
];
[
o_sprefs_toolbar
setDisplayMode
:
NSToolbarDisplayModeIconAndLabel
];
...
@@ -596,9 +595,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
...
@@ -596,9 +595,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
-
(
void
)
showSimplePrefs
-
(
void
)
showSimplePrefs
{
{
/* we want to show the interface settings, if no category was chosen */
/* we want to show the interface settings, if no category was chosen */
if
(
[
o_sprefs_toolbar
selectedItemIdentifier
]
==
nil
)
if
(
[
[
o_sprefs_win
toolbar
]
selectedItemIdentifier
]
==
nil
)
{
{
[
o_sprefs_toolbar
setSelectedItemIdentifier
:
VLCIntfSettingToolbarIdentifier
];
[
[
o_sprefs_win
toolbar
]
setSelectedItemIdentifier
:
VLCIntfSettingToolbarIdentifier
];
[
self
showInterfaceSettings
];
[
self
showInterfaceSettings
];
}
}
...
...
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