Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20fd25c2 authored by Ethan Yonker's avatar Ethan Yonker
Browse files

Improve error handling during MTP startup

Change-Id: I9395481dd8d9cbd3346fe6682557236b48b4d6cd
parent 73da42cb
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -35,16 +35,17 @@

void twmtp_MtpServer::start()
{
	setup();
	if (setup() == 0) {
		add_storage();
		server->run();
	}
}

void twmtp_MtpServer::set_storages(storages* mtpstorages) {
	stores = mtpstorages;
}

void twmtp_MtpServer::setup()
int twmtp_MtpServer::setup()
{
	#define USB_MTP_DEVICE "/dev/mtp_usb"
	usePtp =  false;
@@ -60,8 +61,10 @@ void twmtp_MtpServer::setup()
		refserver = server;
		MTPI("created new mtpserver object\n");
	} else {
		MTPE("could not open MTP driver, errno: %d", errno);
		MTPE("could not open MTP driver, errno: %d\n", errno);
		return -1;
	}
	return 0;
}

void twmtp_MtpServer::run()
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ typedef std::vector<storage*> storages;
class twmtp_MtpServer {
	public:
		void start();
		void setup();
		int setup();
		void run();
		void cleanup();
		void send_object_added(int handle);