diff --git a/docs/en_US/release_notes_7_1.rst b/docs/en_US/release_notes_7_1.rst index f28f179f8..9f0fa01e2 100644 --- a/docs/en_US/release_notes_7_1.rst +++ b/docs/en_US/release_notes_7_1.rst @@ -48,4 +48,5 @@ Bug fixes | `Issue #6158 `_ - Fixed an issue with the properties tab not getting updated if the user updates the selected node. | `Issue #6159 `_ - Ensure that the ERD tool should work with the external database after moving to psycopg3. | `Issue #6180 `_ - Fixed an issue where PSQL is not working if the PGUSER env variable is set and service file is used for server connection details. + | `Issue #6183 `_ - Mac crash when you press Command-Shift-C. | `Issue #6191 `_ - Fixed an issue where Reset Password is not working after upgrading to latest flask-security-too. diff --git a/runtime/src/js/pgadmin.js b/runtime/src/js/pgadmin.js index e4c710a07..d890e1f0b 100644 --- a/runtime/src/js/pgadmin.js +++ b/runtime/src/js/pgadmin.js @@ -43,6 +43,11 @@ if (fs.existsSync('dev_config.json')) { // This functions is used to start the pgAdmin4 server by spawning a // separate process. function startDesktopMode() { + // Disable dev tools shortcut + if (platform() == 'darwin') { + nw.App.registerGlobalHotKey(new nw.Shortcut({key: 'Command+Shift+C'}), ()=>{}); + } + // Return if pgAdmin server process is already spawned // Added check for debugging purpose. if (pgadminServerProcess != null)