Simplify notifications and remove xid dep part 2

libretro · Nov 1, 2019 · 9946105 · 9946105
1 parent d9a2c05
commit 9946105
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ludos/releases.go b/ludos/releases.go
@@ -65,13 +65,13 @@ func DownloadRelease(path, url string) {
 		return
 	}
 
-	nid := ntf.DisplayAndLog(ntf.Info, "Menu", "Downloading update 0%%")
+	n := ntf.DisplayAndLog(ntf.Info, "Menu", "Downloading update 0%%")
 	downloading = true
 	defer func() { downloading = false }()
 
 	req, err := grab.NewRequest(path, url)
 	if err != nil {
-		ntf.Update(nid, ntf.Error, err.Error())
+		n.Update(ntf.Error, err.Error())
 		return
 	}
 
@@ -84,7 +84,7 @@ Loop:
 	for {
 		select {
 		case <-t.C:
-			ntf.Update(nid, ntf.Info, "Downloading update %.0f%%%% ", 100*resp.Progress())
+			n.Update(ntf.Info, "Downloading update %.0f%%%% ", 100*resp.Progress())
 			progress = resp.Progress()
 
 		case <-resp.Done:
@@ -96,13 +96,13 @@ Loop:
 	}
 
 	if err := resp.Err(); err != nil {
-		ntf.Update(nid, ntf.Error, err.Error())
+		n.Update(ntf.Error, err.Error())
 		downloading = false
 		done = false
 		return
 	}
 
-	ntf.Update(nid, ntf.Success, "Done downloading. You can now reboot your system.")
+	n.Update(ntf.Success, "Done downloading. You can now reboot your system.")
 }
 
 // IsDownloading returns true if the updater is currently downloading a release

diff --git a/scanner/scanner.go b/scanner/scanner.go
@@ -73,7 +73,7 @@ func ScanDir(dir string, doneCb func()) {
 }
 
 // Scan scans a list of roms against the database
-func Scan(dir string, roms []string, games chan (rdb.Game), n ntf.Notification) {
+func Scan(dir string, roms []string, games chan (rdb.Game), n *ntf.Notification) {
 	for i, f := range roms {
 		ext := filepath.Ext(f)
 		switch ext {