MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 07:43:50 +00:00
Code Issues Releases Wiki Activity

Fixed user-consent and alerts for macOS Catalina.

Browse Source
This commit is contained in:
Bryan Roe
2020-04-26 23:06:51 -07:00
parent e66adb9858
commit b1872004b0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

2
modules/message-box.js
View File

@@ -571,7 +571,7 @@ function macos_messageBox()
this._shell.stderr.str = ''; this._shell.stderr.on('data', function (chunk) { this.str += chunk.toString(); }); this._shell.stderr.str = ''; this._shell.stderr.on('data', function (chunk) { this.str += chunk.toString(); });
this._shell.stdin.write('osascript -e \'tell current application to display dialog "' + p.caption + '" with title "' + p.title + '" ' + icon + ' ' + buttons + timeout + '\' | awk \'{ c=split($0, tokens, ","); split(tokens[1], val, ":"); if(c==1) { print val[2] } else { split(tokens[2], gu, ":"); if(gu[2]=="true") { print "_TIMEOUT_" } else { print val[2] } } }\'\nexit\n'); this._shell.stdin.write('osascript -e \'tell current application to display dialog "' + p.caption + '" with title "' + p.title + '" ' + icon + ' ' + buttons + timeout + '\' | awk \'{ c=split($0, tokens, ","); split(tokens[1], val, ":"); if(c==1) { print val[2] } else { split(tokens[2], gu, ":"); if(gu[2]=="true") { print "_TIMEOUT_" } else { print val[2] } } }\'\nexit\n');
this._shell.waitExit(); this._shell.waitExit();
if (this._shell.stderr.str != '') if (this._shell.stderr.str != '' && !this._shell.stderr.str.includes('OpenGL'))
{ {
this.end(translateObject({ command: 'ERROR', reason: this._shell.stderr.str })); this.end(translateObject({ command: 'ERROR', reason: this._shell.stderr.str }));
} }