snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix library blacklist and GTK dialogs

This commit is contained in:
Pera Pisar 2019-04-22 23:03:35 +02:00
parent b8c6434a14
commit acef1b4c0e
No known key found for this signature in database
GPG Key ID: 6E1174E4DF875DCA
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries.rb
View File

@ -17,7 +17,7 @@ line = gets
files = [] files = []
while line while line
if line =~ / => (\/.*) \(/ if line =~ / => (\/.*) \(/
if not BLACKLIST.include? $1 if not BLACKLIST.any? {|library| $1.end_with? library }
files << $1 files << $1
end end
end end

5
src/oneshot.cpp
View File

@ -485,12 +485,12 @@ bool Oneshot::msgbox(int type, const char *body, const char *title)
{ {
if (!title) if (!title)
title = ""; title = "";
#if defined OS_LINUX #ifdef OS_LINUX
linux_DialogData data = {type, body, title, 0}; linux_DialogData data = {type, body, title, 0};
gdk_threads_add_idle(linux_dialog, &data); gdk_threads_add_idle(linux_dialog, &data);
gtk_main(); gtk_main();
return data.result; return data.result;
#endif #else
// SDL message box // SDL message box
// Button data // Button data
@ -570,6 +570,7 @@ bool Oneshot::msgbox(int type, const char *body, const char *title)
#endif #endif
return button ? true : false; return button ? true : false;
#endif // #ifdef OS_LINUX
} }
std::string Oneshot::textinput(const char* prompt, int char_limit, const char* fontName) { std::string Oneshot::textinput(const char* prompt, int char_limit, const char* fontName) {