diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-11-26 00:35:14 +0100 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-11-26 01:44:56 +0100 |
commit | 10d77be0d2a5811ed9918c1039210c1d2b47b3bd (patch) | |
tree | df187072c3d53a0b6a8596a4758430d8cfe3667b /src | |
parent | 59611b8b378238e5a589a87061d06fe4f337d1a0 (diff) | |
download | VeraCrypt-10d77be0d2a5811ed9918c1039210c1d2b47b3bd.tar.gz VeraCrypt-10d77be0d2a5811ed9918c1039210c1d2b47b3bd.zip |
Windows: Support creating Traveler Disk when running in Portable Mode
Diffstat (limited to 'src')
-rw-r--r-- | src/Mount/Mount.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index ccf384e3..4a50ee35 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -4070,7 +4070,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa }
// Main app 32-bit
- if (Is64BitOs ())
+ if (Is64BitOs () && !IsNonInstallMode ())
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt-x86.exe", appDir);
else
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt.exe", appDir);
@@ -4082,7 +4082,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa }
// Main app 64-bit
- if (Is64BitOs ())
+ if (Is64BitOs () && !IsNonInstallMode ())
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt.exe", appDir);
else
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt-x64.exe", appDir);
@@ -4097,7 +4097,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa if (copyWizard)
{
// Wizard 32-bit
- if (Is64BitOs ())
+ if (Is64BitOs () && !IsNonInstallMode ())
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format-x86.exe", appDir);
else
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format.exe", appDir);
@@ -4109,7 +4109,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa }
// Wizard 64-bit
- if (Is64BitOs ())
+ if (Is64BitOs () && !IsNonInstallMode ())
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format.exe", appDir);
else
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCrypt Format-x64.exe", appDir);
@@ -4125,7 +4125,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa if (copyExpander)
{
// Expander 32-bit
- if (Is64BitOs ())
+ if (Is64BitOs () && !IsNonInstallMode ())
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander-x86.exe", appDir);
else
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander.exe", appDir);
@@ -4137,7 +4137,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa }
// Expander 64-bit
- if (Is64BitOs ())
+ if (Is64BitOs () && !IsNonInstallMode ())
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander.exe", appDir);
else
StringCbPrintfW (srcPath, sizeof(srcPath), L"%s\\VeraCryptExpander-x64.exe", appDir);
|