Merge "Allow sideloading from /tmp" into android-4.4
diff --git a/gui/action.cpp b/gui/action.cpp
index 344ced3..453304c 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1105,11 +1105,12 @@
int wipe_dalvik = 0;
string Sideload_File;
- if (!PartitionManager.Mount_Current_Storage(true)) {
- operation_end(1, simulate);
- return 0;
+ if (!PartitionManager.Mount_Current_Storage(false)) {
+ gui_print("Using RAM for sideload storage.\n");
+ Sideload_File = "/tmp/sideload.zip";
+ } else {
+ Sideload_File = DataManager::GetCurrentStoragePath() + "/sideload.zip";
}
- Sideload_File = DataManager::GetCurrentStoragePath() + "/sideload.zip";
if (TWFunc::Path_Exists(Sideload_File)) {
unlink(Sideload_File.c_str());
}