From b14eabbdc9009acdf983356d03b588c2ab98ea9d Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 22 Nov 2016 12:00:04 -0800
Subject: [PATCH] Removed quit and install bug

---
 app/main.development.js          | 13 -------------
 app/ui/components/RequestPane.js |  5 ++---
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/main.development.js b/app/main.development.js
index 92bb27701..4d7a1fecb 100644
--- a/app/main.development.js
+++ b/app/main.development.js
@@ -43,7 +43,6 @@ const localStorage = new LocalStorage(localStoragePath);
 
 let mainWindow = null;
 let hasPromptedForUpdates = false;
-let installUpdateBeforeQuiting = false;
 
 // Enable this for CSS grid layout :)
 app.commandLine.appendSwitch('enable-experimental-web-platform-features');
@@ -74,7 +73,6 @@ autoUpdater.on('update-available', () => {
 
 autoUpdater.on('update-downloaded', (e, releaseNotes, releaseName, releaseDate, updateUrl) => {
   console.log(`-- Update Downloaded ${releaseName} --`);
-  installUpdateBeforeQuiting = true;
   showUpdateNotification();
 });
 
@@ -224,17 +222,6 @@ app.on('window-all-closed', () => {
   }
 });
 
-// Intercept normal quit events because we might need to install updates
-app.on('will-quit', e => {
-  if (installUpdateBeforeQuiting) {
-    // Unset this so we don't infinite loop
-    installUpdateBeforeQuiting = false;
-    e.preventDefault();
-
-    autoUpdater.quitAndInstall();
-  }
-});
-
 // Mac-only, when the user clicks the doc icon
 app.on('activate', (e, hasVisibleWindows) => {
   // Create a new window when clicking the doc icon if there isn't one open
diff --git a/app/ui/components/RequestPane.js b/app/ui/components/RequestPane.js
index 99af6b94f..598265b62 100644
--- a/app/ui/components/RequestPane.js
+++ b/app/ui/components/RequestPane.js
@@ -99,10 +99,9 @@ class RequestPane extends Component {
           <TabList>
             <Tab>
               <button>
-                {getContentTypeName(getContentTypeFromHeaders(request.headers))}
+                {getContentTypeName(request.body.mimeType)}
               </button>
-              <ContentTypeDropdown
-                updateRequestMimeType={updateRequestMimeType}/>
+              <ContentTypeDropdown updateRequestMimeType={updateRequestMimeType}/>
             </Tab>
             <Tab>
               <button>