From b4d832f8a2a5a058df741d7658d1cfa4a7e45edb Mon Sep 17 00:00:00 2001
From: Alex Swindler <Alex.Swindler@nrel.gov>
Date: Mon, 29 Jul 2013 14:06:01 -0600
Subject: [PATCH] Fixing a reference to EnergyPlus 7.2 This causes OpenStudio's
 run tab to always say that EnergyPlus 8.0 has not been found, even if it has.

---
 openstudiocore/src/openstudio_lib/RunTabView.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/openstudiocore/src/openstudio_lib/RunTabView.cpp b/openstudiocore/src/openstudio_lib/RunTabView.cpp
index ae826a2c2a4..b415111e84f 100644
--- a/openstudiocore/src/openstudio_lib/RunTabView.cpp
+++ b/openstudiocore/src/openstudio_lib/RunTabView.cpp
@@ -299,8 +299,16 @@ void RunView::getRadiancePreRunWarningsAndErrors(std::vector<std::string> & warn
 void RunView::locateEnergyPlus()
 {
   openstudio::runmanager::ConfigOptions co(true);
-  bool energyplus_7_2_not_installed = co.getTools().getAllByName("energyplus").getAllByVersion(openstudio::runmanager::ToolVersion(7,2)).tools().size() == 0;
-  if (energyplus_7_2_not_installed){
+  boost::optional<int> major = getRequiredEnergyPlusVersion().getMajor();
+  boost::optional<int> minor = getRequiredEnergyPlusVersion().getMinor();
+  bool energyplus_not_installed;
+  if (major && minor){
+    energyplus_not_installed = co.getTools().getAllByName("energyplus").getAllByVersion(openstudio::runmanager::ToolVersion(*major,*minor)).tools().size() == 0;
+  } else {
+    energyplus_not_installed = co.getTools().getAllByName("energyplus").getAllByVersion(openstudio::runmanager::ToolVersion(8,0)).tools().size() == 0;
+  }
+  
+  if (energyplus_not_installed){
     m_toolWarningLabel->show();
   } else {
     m_toolWarningLabel->hide();