AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Application Not Responding when uploading map

Browse Source
This commit is contained in:
Yair Morgenstern 2019-12-13 14:40:45 +02:00
parent 307bccb7d0
commit 7eda5e9d31
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt
View File

@ -14,6 +14,7 @@ import com.unciv.ui.saves.Gzip
import com.unciv.ui.utils.onClick import com.unciv.ui.utils.onClick
import com.unciv.ui.worldscreen.optionstable.DropBox import com.unciv.ui.worldscreen.optionstable.DropBox
import com.unciv.ui.worldscreen.optionstable.PopupTable import com.unciv.ui.worldscreen.optionstable.PopupTable
import kotlin.concurrent.thread
class MapEditorMenuPopup(mapEditorScreen: MapEditorScreen): PopupTable(mapEditorScreen){ class MapEditorMenuPopup(mapEditorScreen: MapEditorScreen): PopupTable(mapEditorScreen){
init{ init{
@ -64,6 +65,7 @@ class MapEditorMenuPopup(mapEditorScreen: MapEditorScreen): PopupTable(mapEditor
val uploadMapButton = TextButton("Upload map".tr(), skin) val uploadMapButton = TextButton("Upload map".tr(), skin)
uploadMapButton.onClick { uploadMapButton.onClick {
thread {
try { try {
val gzippedMap = Gzip.zip(Json().toJson(mapEditorScreen.tileMap)) val gzippedMap = Gzip.zip(Json().toJson(mapEditorScreen.tileMap))
DropBox().uploadFile("/Maps/" + mapEditorScreen.mapName, gzippedMap) DropBox().uploadFile("/Maps/" + mapEditorScreen.mapName, gzippedMap)
@ -73,8 +75,7 @@ class MapEditorMenuPopup(mapEditorScreen: MapEditorScreen): PopupTable(mapEditor
uploadedSuccessfully.addGoodSizedLabel("Map uploaded successfully!").row() uploadedSuccessfully.addGoodSizedLabel("Map uploaded successfully!").row()
uploadedSuccessfully.addCloseButton() uploadedSuccessfully.addCloseButton()
uploadedSuccessfully.open() uploadedSuccessfully.open()
} } catch (ex: Exception) {
catch(ex:Exception){
remove() remove()
val couldNotUpload = PopupTable(screen) val couldNotUpload = PopupTable(screen)
couldNotUpload.addGoodSizedLabel("Could not upload map!").row() couldNotUpload.addGoodSizedLabel("Could not upload map!").row()
@ -82,6 +83,7 @@ class MapEditorMenuPopup(mapEditorScreen: MapEditorScreen): PopupTable(mapEditor
couldNotUpload.open() couldNotUpload.open()
} }
} }
}
add(uploadMapButton).row() add(uploadMapButton).row()