Merge pull request #633 from laanwj/qtrpcconflict
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 14 Nov 2011 14:56:57 +0000 (06:56 -0800)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 14 Nov 2011 14:56:57 +0000 (06:56 -0800)
commit88a1b894527cf03462a50922fe2185ac53fc6c6d
tree8961d86d99302a2ea7800000f1307c8e437c939a
parent405ce5a876f96a4fbd136129269df0edeb4c7a55
parent19197d5e2973785e37b8b0eeefc3d6af0b2bb1fc
Merge pull request #633 from laanwj/qtrpcconflict

RPC: do not launch Shutdown in a new thread in case we are running the UI