Merge pull request #38 from hjaltisan/EO11402

Minor bugfixes
ccpgames · Dec 11, 2020 · 0207ba1 · 0207ba1
2 parents 18d5162 + 0de13fc
commit 0207ba1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
@@ -2254,7 +2254,7 @@ void CustomIntroductionPage::showInstallerInformation()
     m_lineEdit->setVisible(true);
     m_spaceLabel->setVisible(true);
     m_browseButton->setVisible(true);
-    if (packageManagerCore()->value(QLatin1String("InstallRedists"), QLatin1String("false")) == QLatin1String("true"))
+    if (packageManagerCore()->isInstaller() && packageManagerCore()->value(QLatin1String("InstallRedists"), QLatin1String("false")) == QLatin1String("true"))
     {
         m_redistLabel->setVisible(true);
     }
@@ -2412,7 +2412,7 @@ void CustomIntroductionPage::entering()
     }
 
     QString installRedistText = core->value(QLatin1String("InstallRedists"), QLatin1String("false"));
-    m_redistLabel->setVisible(installRedistText == QLatin1String("true"));
+    m_redistLabel->setVisible(core->isInstaller() && installRedistText == QLatin1String("true"));
 }
 
 /*!
@@ -2465,7 +2465,7 @@ void CustomIntroductionPage::showWidgets(bool show)
     m_msgLabel->setVisible(show);
     if (show)
     {
-        if (packageManagerCore()->value(QLatin1String("InstallRedists"), QLatin1String("false")) == QLatin1String("true"))
+        if (packageManagerCore()->isInstaller() && packageManagerCore()->value(QLatin1String("InstallRedists"), QLatin1String("false")) == QLatin1String("true"))
         {
             m_redistLabel->setVisible(true);
         }

diff --git a/src/sdk/translations/ifw_fr.ts b/src/sdk/translations/ifw_fr.ts
@@ -2769,7 +2769,7 @@ Souhaitez-vous continuer ?</translation>
     <name>QInstaller::FinishedPage</name>
     <message>
         <source>Quit</source>
-        <translation>Выйти</translation>
+        <translation>Quitter</translation>
     </message>
 </context>
 <!--