FRON-58

anzihenry · Aug 27, 2019 · 2951cc3 · 2951cc3
1 parent 05b9ac1
commit 2951cc3
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 1 deletion.
diff --git a/USBFlux/USBFlux/AppDelegate.m b/USBFlux/USBFlux/AppDelegate.m
@@ -494,7 +494,7 @@ - (void)checkStatus:(NSTimer*)timer
         if (localInst) {
             local_devices = [[localInst objectForKey:@"DeviceCount"] intValue];
         }
-        self.detailLabel.stringValue = [NSString stringWithFormat:@"%d Instance%s (%d Local / %d Remote)\n%d Device%s (%d Local / %d Remote)", local_count+remote_count,  (local_count+remote_count == 1) ? "" : "s", local_count, remote_count, local_devices+remote_devices, (local_devices+remote_devices == 1) ? "" : "s", local_devices, remote_devices];
+        self.detailLabel.stringValue = [NSString stringWithFormat:@"%d Device%s (%d Local / %d Remote)", local_devices+remote_devices, (local_devices+remote_devices == 1) ? "" : "s", local_devices, remote_devices];
         self.detailLabel.hidden = NO;
     } else {
         usbfluxd_running = 0;

diff --git a/src/Makefile.am → usbfluxd/Makefile.am b/src/Makefile.am → usbfluxd/Makefile.am
diff --git a/src/client.c → usbfluxd/client.c b/src/client.c → usbfluxd/client.c
diff --git a/src/client.h → usbfluxd/client.h b/src/client.h → usbfluxd/client.h
diff --git a/src/log.c → usbfluxd/log.c b/src/log.c → usbfluxd/log.c
diff --git a/src/log.h → usbfluxd/log.h b/src/log.h → usbfluxd/log.h
diff --git a/src/main.c → usbfluxd/main.c b/src/main.c → usbfluxd/main.c
diff --git a/src/socket.c → usbfluxd/socket.c b/src/socket.c → usbfluxd/socket.c
diff --git a/src/socket.h → usbfluxd/socket.h b/src/socket.h → usbfluxd/socket.h
diff --git a/src/usbmux_remote.c → usbfluxd/usbmux_remote.c b/src/usbmux_remote.c → usbfluxd/usbmux_remote.c
diff --git a/src/usbmux_remote.h → usbfluxd/usbmux_remote.h b/src/usbmux_remote.h → usbfluxd/usbmux_remote.h
diff --git a/src/usbmuxd-proto.h → usbfluxd/usbmuxd-proto.h b/src/usbmuxd-proto.h → usbfluxd/usbmuxd-proto.h
diff --git a/src/utils.c → usbfluxd/utils.c b/src/utils.c → usbfluxd/utils.c
diff --git a/src/utils.h → usbfluxd/utils.h b/src/utils.h → usbfluxd/utils.h