aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2014-06-09 19:35:13 +0300
committerJukka Jylänki <jujjyl@gmail.com>2014-06-09 19:35:13 +0300
commitcade5567c4ee4562a3214bef2bc553381681a037 (patch)
tree854df75000d205f0f7041fe2826150ee5b7cae91
parentdbb10274be5e2193f823b38f6dc710a27f86bee8 (diff)
Add a nicer quit message when pressing Ctrl-C to abort an operation in ffdb.
-rw-r--r--src/library_sdl.js2
-rwxr-xr-xtools/ffdb.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index a01b3c6c..7145a7ba 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -2601,7 +2601,7 @@ var LibrarySDL = {
if (info && info.audio) {
info.audio.pause();
} else {
- Module.printErr('Mix_Pause: no sound found for channel: ' + channel);
+ //Module.printErr('Mix_Pause: no sound found for channel: ' + channel);
}
},
diff --git a/tools/ffdb.py b/tools/ffdb.py
index b98814f7..a6bc716b 100755
--- a/tools/ffdb.py
+++ b/tools/ffdb.py
@@ -65,6 +65,9 @@ def read_b2g_response(print_errors_to_console = True):
global read_queue, b2g_socket
try:
read_queue += b2g_socket.recv(65536*2)
+ except KeyboardInterrupt:
+ print ' Aborted by user'
+ sys.exit(1)
except Exception, e:
if e[0] == 57: # Socket is not connected
print 'Error! Failed to receive data from the device: socket is not connected!'