[shotwell/wip/phako/4927] Camera: Fix import from camera
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/phako/4927] Camera: Fix import from camera
- Date: Sat, 29 May 2021 10:41:00 +0000 (UTC)
commit 29cf40fff3697ab59aedacb91513b016a478698e
Author: Jens Georg <mail jensge org>
Date: Sat May 29 11:04:45 2021 +0200
Camera: Fix import from camera
The teneray operator seems to generate invalid code which corrupts the
basedir, leading to either no thumbnails nor no files at all
Fixes #4927
src/camera/ImportPage.vala | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 375e5cb0..b7c9716f 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1330,8 +1330,12 @@ public class ImportPage : CheckerboardPage {
if (fsid >= sifs.length)
return null;
-
- return (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) ? (string) sifs[fsid].basedir :
"/";
+
+ if (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) {
+ return (string) sifs[fsid].basedir;
+ } else {
+ return "/";
+ }
}
public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]