diff --git a/InForm/UiEditor.bas b/InForm/UiEditor.bas index dd75a60..419f6ea 100644 --- a/InForm/UiEditor.bas +++ b/InForm/UiEditor.bas @@ -1299,22 +1299,12 @@ SUB __UI_BeforeUpdateDisplay STATIC updateDescription$ localVersionNumber! = __UI_VersionNumber - localVersionIsBeta%% = __UI_VersionIsBeta serverVersion$ = ReadSetting("InForm/InFormUpdate.ini", "", "version") - isBeta$ = ReadSetting("InForm/InFormUpdate.ini", "", "beta") updateDescription$ = ReadSetting("InForm/InFormUpdate.ini", "", "description") - IF isBeta$ = "true" THEN isBeta$ = "Beta version " ELSE isBeta$ = "" - serverBeta%% = True - IF localVersionIsBeta%% THEN - IF serverBeta%% AND VAL(serverVersion$) <= localVersionNumber! THEN - CheckUpdateDone = True - END IF - ELSE - IF VAL(serverVersion$) <= localVersionNumber! THEN - CheckUpdateDone = True - END IF + IF VAL(serverVersion$) <= localVersionNumber! THEN + CheckUpdateDone = True END IF ThisStep = 3 @@ -2709,7 +2699,7 @@ SUB __UI_OnLoad END IF $ELSE IF _FILEEXISTS("InForm/updater/InFormUpdater") = False THEN - TriggerUpdaterRecompile = True + TriggerUpdaterRecompile = True END IF $END IF END IF diff --git a/InForm/updater/InFormUpdater.bas b/InForm/updater/InFormUpdater.bas index 85f2ff5..6908343 100644 --- a/InForm/updater/InFormUpdater.bas +++ b/InForm/updater/InFormUpdater.bas @@ -71,22 +71,13 @@ SUB __UI_BeforeUpdateDisplay STATIC localVersionNumber! = __UI_VersionNumber localVersionisBeta%% = __UI_VersionIsBeta IF localVersionisBeta%% THEN localBeta$ = " Beta version " ELSE localBeta$ = " " - Report "Local version:" + localBeta$ + LTRIM$(STR$(localVersionNumber!)) + Report "Local build:" + localBeta$ + LTRIM$(STR$(localVersionNumber!)) serverVersion$ = ReadSetting("InFormUpdate.ini", "", "version") - isBeta$ = ReadSetting("InFormUpdate.ini", "", "beta") - serverBeta%% = False - IF isBeta$ = "true" THEN serverBeta%% = True: isBeta$ = " Beta version " ELSE isBeta$ = " " - Report "Remote version:" + isBeta$ + serverVersion$ + Report "Remote build:" + isBeta$ + serverVersion$ - IF localVersionisBeta%% THEN - IF serverBeta%% AND VAL(serverVersion$) <= localVersionNumber! THEN - NextEvent = True: ThisStep = 7: EXIT SUB - END IF - ELSE - IF VAL(serverVersion$) <= localVersionNumber! THEN - NextEvent = True: ThisStep = 7: EXIT SUB - END IF + IF VAL(serverVersion$) <= localVersionNumber! THEN + NextEvent = True: ThisStep = 7: EXIT SUB END IF thisFile% = 0