mirror of
https://github.com/Zaarrg/stremio-community-v5.git
synced 2026-05-13 21:41:00 +00:00
F5, weird ui and updater for portable version fix
- F5 Reload not working blank page fixed - Removed browser args that broke ui - Added overrideinstalldir for portable version updating to work
This commit is contained in:
parent
667995aa97
commit
f5e0b9c674
2 changed files with 22 additions and 12 deletions
21
src/main.cpp
21
src/main.cpp
|
|
@ -1703,7 +1703,7 @@ LONG WINAPI ExceptionFilter(EXCEPTION_POINTERS* ExceptionInfo) {
|
|||
static void WaitAndRefreshIfNeeded() {
|
||||
std::thread([](){
|
||||
int attempts = 15; // Number of total attempts
|
||||
int waitTime = 1; // Initial wait time in seconds
|
||||
int waitTime = 4; // Initial wait time in seconds
|
||||
|
||||
std::this_thread::sleep_for(std::chrono::seconds(waitTime));
|
||||
std::cout << "[WEBVIEW]: Checking Web Page state..." << std::endl;
|
||||
|
|
@ -1749,9 +1749,7 @@ static void SetupWebMessageHandler()
|
|||
[](ICoreWebView2* sender, ICoreWebView2NavigationCompletedEventArgs* args)->HRESULT
|
||||
{
|
||||
std::cout<<"[WEBVIEW]: Navigation Complete\n";
|
||||
if (!g_isAppReady) {
|
||||
sender->ExecuteScript(L"initShellComm();", nullptr);
|
||||
}
|
||||
sender->ExecuteScript(L"initShellComm();", nullptr);
|
||||
if (g_hSplash && !g_waitStarted.exchange(true)) {
|
||||
WaitAndRefreshIfNeeded();
|
||||
}
|
||||
|
|
@ -1766,9 +1764,7 @@ static void SetupWebMessageHandler()
|
|||
Callback<ICoreWebView2DOMContentLoadedEventHandler>(
|
||||
[](ICoreWebView2* sender, IUnknown* args) -> HRESULT {
|
||||
std::cout<<"[WEBVIEW]: DOM content loaded\n";
|
||||
if (!g_isAppReady) {
|
||||
sender->ExecuteScript(L"initShellComm();", nullptr);
|
||||
}
|
||||
sender->ExecuteScript(L"initShellComm();", nullptr);
|
||||
return S_OK;
|
||||
}
|
||||
).Get(),
|
||||
|
|
@ -1780,9 +1776,7 @@ static void SetupWebMessageHandler()
|
|||
Callback<ICoreWebView2ContentLoadingEventHandler>(
|
||||
[](ICoreWebView2* sender, IUnknown* args) -> HRESULT {
|
||||
std::cout<<"[WEBVIEW]: Content loaded\n";
|
||||
if (!g_isAppReady) {
|
||||
sender->ExecuteScript(L"initShellComm();", nullptr);
|
||||
}
|
||||
sender->ExecuteScript(L"initShellComm();", nullptr);
|
||||
return S_OK;
|
||||
}
|
||||
).Get(),
|
||||
|
|
@ -2001,7 +1995,7 @@ static ComPtr<ICoreWebView2EnvironmentOptions> setupEnvironment() {
|
|||
AppendToCrashLog(L"[WEBVIEW]: Failed to create WebView2 environment options.");
|
||||
return nullptr;
|
||||
}
|
||||
options->put_AdditionalBrowserArguments(L"--disable-gpu --autoplay-policy=no-user-gesture-required --disable-features=msWebOOUI,msPdfOOUI,msSmartScreenProtection --disable_direct_composition_video_overlays=1 --disable_direct_composition_sw_video_overlays=1");
|
||||
options->put_AdditionalBrowserArguments(L"--autoplay-policy=no-user-gesture-required --disable-features=msWebOOUI,msPdfOOUI,msSmartScreenProtection");
|
||||
ComPtr<ICoreWebView2EnvironmentOptions6> options6;
|
||||
if (options.As(&options6) == S_OK)
|
||||
{
|
||||
|
|
@ -2561,12 +2555,15 @@ static void RunInstallerAndExit() {
|
|||
return;
|
||||
}
|
||||
|
||||
std::wstring exeDir = GetExeDirectory();
|
||||
std::wstring arguments = L"/overrideInstallDir=\"" + exeDir + L"\"";
|
||||
|
||||
// Use ShellExecute to run the installer
|
||||
HINSTANCE result = ShellExecuteW(
|
||||
nullptr,
|
||||
L"open",
|
||||
g_installerPath.c_str(),
|
||||
nullptr,
|
||||
arguments.c_str(),
|
||||
nullptr,
|
||||
SW_HIDE
|
||||
);
|
||||
|
|
|
|||
|
|
@ -398,6 +398,19 @@ done:
|
|||
FileOpen $0 "$INSTDIR\addons.txt" w
|
||||
FileWrite $0 "$R1"
|
||||
FileClose $0
|
||||
|
||||
; --- Begin custom override logic ---
|
||||
; Check for overrideInstallDir parameter
|
||||
ClearErrors
|
||||
${GetParameters} $Parameters ; Retrieve all parameters again if needed
|
||||
${GetOptions} $Parameters "/overrideInstallDir=" $0
|
||||
StrCmp $0 "" noOverride
|
||||
|
||||
; If override parameter provided, override $INSTDIR
|
||||
StrCpy $INSTDIR $0
|
||||
|
||||
noOverride:
|
||||
; --- End custom override logic ---
|
||||
FunctionEnd
|
||||
|
||||
Section ; App Files
|
||||
|
|
|
|||
Loading…
Reference in a new issue