Skip to content

V
vlc-gpu
Commit a06577f8 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fix UTF8 rendering issue in question dialog

parent 72b72e63
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
modules/gui/macosx/coredialogs.m
View file @ a06577f8
...@@ -96,8 +96,11 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; ...@@ -96,8 +96,11 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
{ {
dialog_fatal_t *p_dialog = [o_value pointerValue]; dialog_fatal_t *p_dialog = [o_value pointerValue];
NSAlert *o_alert; NSAlert *o_alert;
NSString *o_message;
if (p_dialog->message != NULL)
o_message = [NSString stringWithUTF8String: p_dialog->message];
o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: _NS("OK") alternateButton: nil otherButton: nil informativeTextWithFormat: @"%s", p_dialog->message]; o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: _NS("OK") alternateButton: nil otherButton: nil informativeTextWithFormat: o_message];
[o_alert setAlertStyle: NSCriticalAlertStyle]; [o_alert setAlertStyle: NSCriticalAlertStyle];
[o_alert runModal]; [o_alert runModal];
} }
...@@ -106,7 +109,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; ...@@ -106,7 +109,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
{ {
dialog_question_t *p_dialog = [o_value pointerValue]; dialog_question_t *p_dialog = [o_value pointerValue];
NSAlert *o_alert; NSAlert *o_alert;
NSString *o_yes, *o_no, *o_cancel; NSString *o_yes, *o_no, *o_cancel, *o_message;;
NSInteger i_returnValue = 0; NSInteger i_returnValue = 0;
if( p_dialog->yes != NULL ) if( p_dialog->yes != NULL )
...@@ -115,8 +118,10 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil; ...@@ -115,8 +118,10 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
o_no = [NSString stringWithUTF8String: p_dialog->no]; o_no = [NSString stringWithUTF8String: p_dialog->no];
if( p_dialog->cancel != NULL ) if( p_dialog->cancel != NULL )
o_cancel = [NSString stringWithUTF8String: p_dialog->cancel]; o_cancel = [NSString stringWithUTF8String: p_dialog->cancel];
if (p_dialog->message != NULL)
o_message = [NSString stringWithUTF8String: p_dialog->message];
o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: o_yes alternateButton:o_no otherButton: o_cancel informativeTextWithFormat: @"%s", p_dialog->message]; o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: o_yes alternateButton:o_no otherButton: o_cancel informativeTextWithFormat:o_message];
[o_alert setAlertStyle: NSInformationalAlertStyle]; [o_alert setAlertStyle: NSInformationalAlertStyle];
i_returnValue = [o_alert runModal]; i_returnValue = [o_alert runModal];
......
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