commit cc8ddca9bd78913ed50ef8cbd6a2d2c095823f1a
author that <github@that.at> Sat Jan 03 01:59:36 2015 +0100
committer Ethan Yonker <dees_troy@teamw.in> Sat Jan 03 22:34:48 2015 -0600
tree 1d3407ab420097065a7b91d9ab77c05025866ff9
parent d83c9ea371d74a7abeb92d6bfc3603c13e5f034d

fix adb sideload

- "Cancel" button handling requires another thread
- simplify handling of child pid
- merge duplicated code for reinjecting TWRP after installation
- fix error that showed on host PC after sideload finished
- fix problem where adbd sometimes does not stop correctly

Change-Id: I536877f024b606756c6a3289c6ddfdba423a60d6

openrecoveryscript.cpp

diff --git a/openrecoveryscript.cpp b/openrecoveryscript.cpp
index 0b71a42..0db55cd 100644
--- a/openrecoveryscript.cpp
+++ b/openrecoveryscript.cpp
@@ -356,7 +356,8 @@
 					gui_print("Starting ADB sideload feature...\n");
 					DataManager::SetValue("tw_has_cancel", 1);
 					DataManager::SetValue("tw_cancel_action", "adbsideloadcancel");
-					ret_val = apply_from_adb(Sideload_File.c_str());
+					pid_t child_pid;
+					ret_val = apply_from_adb(Sideload_File.c_str(), &child_pid);
 					DataManager::SetValue("tw_has_cancel", 0);
 					if (ret_val != 0)
 						ret_val = 1; // failure