@@ -10,7 +10,11 @@ downloadServer <- function(id, gs){

       #Controls the Download button

       observe({

-        

+        if(is.null(gs())){

+          hide("downloadData")

+        } else {

+          show("downloadData")

+        }

       })

       output$downloadData <- downloadHandler(

@@ -18,15 +22,15 @@ downloadServer <- function(id, gs){

           paste("gsva_es-", Sys.Date(), ".csv", sep="")

         },

         content = function(file) {

-            if("ExpressionSet" %in% class(gs)) 

+            if("ExpressionSet" %in% class(gs())) 

             {

-              expressionSetObs <- exprs(gs)

+              expressionSetObs <- exprs(gs())

               dataFrameObs <- as.data.frame(expressionSetObs)

               write.csv(dataFrameObs, file)

             }

             else

             {

-              dataFrameObs <- as.data.frame(gs)

+              dataFrameObs <- as.data.frame(gs())

               write.csv(dataFrameObs, file)

             } 

         }

@@ -10,7 +10,7 @@ library(future)

 library(promises)

 library(shinyjs)

 library(shinybusy)

-plan(multisession, gc=TRUE)

+plan(multisession)

 source("argumentsDataModule.R")

 source("modalGSVAModule.R")

 source("downloadModule.R")

@@ -11,11 +11,11 @@ modalGSVAUI <- function(id){

   )

 }

-modalGSVAServer <- function(id, console.text, gsva.cancel){

+modalGSVAServer <- function(id, console.text, gsva.cancel, rout){

   moduleServer(

     id,

     function(input, output, session){

-      

+

       output$text <- renderText({

         req(console.text())

         max <- length(console.text())

@@ -29,7 +29,11 @@ modalGSVAServer <- function(id, console.text, gsva.cancel){

       observeEvent(input$cancel, {

         removeModal()

         gsva.cancel(TRUE)

-        plan(multisession, gc=TRUE)

+        write("", file=rout)

+        # changing plan() is the only and recommended way to safely 'interrupt' a future process:

+        # https://github.com/HenrikBengtsson/future/issues/93

+        plan(sequential)

+        plan(multisession)

       })

     }

   )

@@ -9,6 +9,7 @@ plot2_Server <- function(id, eventData1, rv){

     function(input, output, session){

       output$plot2 <- renderPlotly({

+        req(eventData1())

         rv$sample.c <- colnames(rv$gs)[eventData1()]

         data <- rv$dat.t[Sample==rv$sample.c]

         p <- ggplot(data = data, aes(x=value, color=Sample)) +

@@ -89,7 +89,7 @@ function(input, output, session) {

   })

   # PRINTING CONSOLE.TEXT

-  modalGSVAServer("modal.text", console.text, gsva.cancel)

+  modalGSVAServer("modal.text", console.text, gsva.cancel, rout)

   # PLOT1 RENDER

   plot1_Server("plot1", rv)

@@ -113,7 +113,7 @@ function(input, output, session) {

   plot3_Server("plot3", eventData2, rv, rv$matrix, rv$genesets)

   # DWN BTN

-  downloadServer("download", rv$gs)

+  downloadServer("download", reactive(rv$gs))

   # CLOSE BTN

   closeBtnServer("close", reactive(rv$gs))