Merge pull request #3805 from Akarshit/master

Update to a incompatible version is not possible
processing · Sep 16, 2015 · 43fd2b1 · 43fd2b1
2 parents a0a7aba + 22928ff
commit 43fd2b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java
@@ -515,7 +515,8 @@ boolean hasUpdates(Contribution contribution) {
       if (advertised == null) {
         return false;
       }
-      return advertised.getVersion() > contribution.getVersion();
+      return advertised.getVersion() > contribution.getVersion()
+        && advertised.isCompatible(Base.getRevision());
     }
     return false;
   }

diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java
@@ -238,6 +238,16 @@ public void update(ContributionPanel panel) {
       contributionListing.getLatestVersion(panel.getContrib());
     String currentVersion = panel.getContrib().getPrettyVersion();
 
+    installButton.setEnabled(!panel.getContrib().isInstalled()
+                             && contributionListing.hasDownloadedLatestList()
+                             && panel.getContrib().isCompatible(Base.getRevision()));
+
+    if (installButton.isEnabled()) {
+      updateLabel.setText(latestVersion + " available");
+    } else {
+      updateLabel.setText(currentVersion + " installed");
+    }
+
     if (latestVersion != null) {
       latestVersion = "Update to " + latestVersion;
     } else {
@@ -254,15 +264,6 @@ public void update(ContributionPanel panel) {
       updateButton.setText("Update");
     }
 
-    installButton.setEnabled(!panel.getContrib().isInstalled()
-      && contributionListing.hasDownloadedLatestList()
-      && panel.getContrib().isCompatible(Base.getRevision()));
-
-    if (installButton.isEnabled()) {
-      updateLabel.setText(currentVersion + " available");
-    } else {
-      updateLabel.setText(currentVersion + " installed");
-    }
 
     removeButton.setEnabled(panel.getContrib().isInstalled());
     progressBarPanel.add(panel.installProgressBar);