2 files changed, 15 insertions, 11 deletions

diff --git a/backend/controllers/recordController.go b/backend/controllers/recordController.go
index 28c55e0..1c0f3b2 100644
--- a/backend/controllers/recordController.go
+++ b/backend/controllers/recordController.go
@@ -71,7 +71,10 @@ func CreateRecordWithDemo(c *gin.Context) {
                 return
         }
         // Demo files
-        demoFiles := []*multipart.FileHeader{record.HostDemo, record.PartnerDemo}
+        demoFiles := []*multipart.FileHeader{record.HostDemo}
+        if isCoop {
+                demoFiles = append(demoFiles, record.PartnerDemo)
+        }
         var hostDemoUUID, hostDemoFileID, partnerDemoUUID, partnerDemoFileID string
         var hostDemoScoreCount, hostDemoScoreTime int
         client := serviceAccount()
@@ -91,12 +94,12 @@ func CreateRecordWithDemo(c *gin.Context) {
         for i, header := range demoFiles {
                 uuid := uuid.New().String()
                 // Upload & insert into demos
-                err = c.SaveUploadedFile(header, "backend/parser/demos/"+header.Filename)
+                err = c.SaveUploadedFile(header, "backend/parser/"+header.Filename)
                 if err != nil {
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
                 }
-                f, err := os.Open("backend/parser/demos/" + header.Filename)
+                f, err := os.Open("backend/parser/" + header.Filename)
                 if err != nil {
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
@@ -107,7 +110,7 @@ func CreateRecordWithDemo(c *gin.Context) {
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
                 }
-                hostDemoScoreCount, hostDemoScoreTime, err = parser.ProcessDemo("backend/parser/demos/" + header.Filename)
+                hostDemoScoreCount, hostDemoScoreTime, err = parser.ProcessDemo("backend/parser/" + header.Filename)
                 if err != nil {
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
@@ -125,7 +128,7 @@ func CreateRecordWithDemo(c *gin.Context) {
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                         return
                 }
-                os.Remove("backend/parser/demos/" + header.Filename)
+                os.Remove("backend/parser/" + header.Filename)
         }
         // Insert into records
         if isCoop {
diff --git a/backend/parser/parser.go b/backend/parser/parser.go
index 040b94a..562b8c0 100644
--- a/backend/parser/parser.go
+++ b/backend/parser/parser.go
@@ -3,15 +3,17 @@ package parser
 import (
         "bufio"
         "fmt"
+        "log"
         "os/exec"
         "strconv"
         "strings"
 )
 
 func ProcessDemo(demoPath string) (int, int, error) {
-        cmd := exec.Command("bash", "-c", fmt.Sprintf(`echo "FEXBash" && ./parser %s`, demoPath))
+        cmd := exec.Command("bash", "-c", fmt.Sprintf(`echo "FEXBash" && ./backend/parser/parser %s`, demoPath))
         stdout, err := cmd.StdoutPipe()
         if err != nil {
+                log.Println(err)
                 return 0, 0, err
         }
         cmd.Start()
@@ -34,9 +36,8 @@ func ProcessDemo(demoPath string) (int, int, error) {
                         }
                 }
         }
-        err = cmd.Wait()
-        if err != nil {
-                return 0, 0, err
-        }
-        return cmTicks, portalCount, nil
+        cmd.Wait()
+        // We don't check for error in wait, since FEXBash always gives segmentation fault
+        // Wanted output is retrieved, so it's okay (i think)
+        return portalCount, cmTicks, nil
 }